murakumo 0.4.7 → 0.6.0

data/README

@@ -12,6 +12,8 @@ https://github.com/cookpad/murakumo
 
 * RubyDNS
 * SQLite
+* Ruby1.9 (murakumo version is 0.6.0 or more)
+
 
 == Install
 

data/bin/murakumo-install-init-script

@@ -22,7 +22,16 @@ else
   exit 1
 end
 
-bin_dir = ((RbConfig::CONFIG['bindir'] rescue nil) || '').strip
+bin_dir = nil
+
+if defined?(Gem)
+  bin_dir = Gem.bindir
+elsif defined?(RbConfig)
+  bin_dir = ((RbConfig::CONFIG['bindir'] rescue nil) || '').strip
+else
+  $stderr.puts 'error: bin dir is not found.'
+  exit 1
+end
 
 `cp -i #{gem_dir}/murakumo-#{Murakumo::VERSION}/etc/murakumo.server #{INIT_D_DIR}/murakumo`
 `chmod 755 #{INIT_D_DIR}/murakumo`

data/lib/cli/murakumo.rb

@@ -12,7 +12,7 @@ if options[:daemon]
   # RExecに処理を委譲するのでARGVの先頭にdaemonizeのコマンドを格納
   ARGV.unshift options[:daemon].to_s
 
-  Murakumo::Server.pid_directory = options[:pid_dir]
+  Murakumo::Server.working_directory = options[:working_dir]
   Murakumo::Server.daemonize
 else
   # デーモン化しない場合

data/lib/cli/murakumo_options.rb

@@ -1,6 +1,6 @@
 require 'logger'
 require 'optopus'
-require 'resolv'
+require 'rubydns'
 require 'socket'
 
 require 'cli/murakumo_initializer_context'
@@ -107,8 +107,8 @@ def murakumo_parse_args
     desc 'command of daemonize: {start|stop|restart|status}'
     option :daemon, '-d', '--daemon CMD', :type => [:start, :stop, :restart, :status]
 
-    desc 'directory of a pid file'
-    option :pid_dir, '-f', '--pid-dir PATH'
+    desc 'var directory path'
+    option :working_dir, '-w', '--working-dir PATH', :default => '/var'
 
     desc 'output path of a log'
     option :log_path, '-l', '--log-path PATH'
@@ -145,8 +145,11 @@ def murakumo_parse_args
 
       # resolver
       if options[:resolver]
-        options[:resolver] = options[:resolver].map {|i| i.strip }
-        options[:resolver] = Resolv::DNS.new(:nameserver => options[:resolver])
+        servers = []
+        options[:resolver].each do |addr|
+          [:udp, :tcp].each {|prot| servers << [prot, addr.strip, 53] }
+        end
+        options[:resolver] = RubyDNS::Resolver.new(servers)
       end
 
       # initial nodes

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.4.7'
+  VERSION = Version = '0.6.0'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -481,7 +481,7 @@ module Murakumo
 
     # Search of records
 
-    def address_exist?(name)
+    def address_exist?(name, resource_class)
       # includes、excludesのチェック
       if @options[:name_excludes] and @options[:name_excludes].any? {|r| r =~ name }
         return false
@@ -582,7 +582,7 @@ module Murakumo
       @address_records = nil
     end
 
-    def name_exist?(address)
+    def name_exist?(address, resource_class)
       address = x_ip_addr(address)
 
       # includes、excludesのチェック

data/lib/srv/murakumo_server.rb

@@ -17,17 +17,21 @@ module Murakumo
     # クラスメソッドを定義
     class << self
 
+      IN = Resolv::DNS::Resource::IN
+
       def init(options)
         # クラスインスタンス変数を使わないこと
         @@options = options
         @@cloud = Cloud.new(options)
       end
 
-      def pid_directory=(path)
-        @@pid_directory = path
+      def working_directory=(path)
+        @@base_directory = path
       end
 
       def run
+        EventMachine.epoll
+
         RubyDNS.run_server(:listen => [[:udp, @@options[:dns_address], @@options[:dns_port]]]) do
           # RubyDNS::Serverのコンテキスト
           @logger = @@options[:logger] if @@options[:logger]
@@ -39,6 +43,7 @@ module Murakumo
 
               # ServerクラスをDRuby化
               DRb.start_service("drbunix:#{@@options[:socket]}", @@cloud)
+              File.chmod(0700, @@options[:socket])
               at_exit { FileUtils.rm_f(@@options[:socket]) }
             end
 
@@ -66,7 +71,7 @@ module Murakumo
           end
 
           # look up A record
-          match(@@cloud.method(:address_exist?), :A) do |transaction|
+          match(@@cloud.method(:address_exist?), IN::A) do |transaction|
             records = @@cloud.lookup_addresses(transaction.name)
 
             addrs = []
@@ -90,7 +95,7 @@ module Murakumo
           end # match
 
           # look up PTR record
-          match(@@cloud.method(:name_exist?), :PTR) do |transaction|
+          match(@@cloud.method(:name_exist?), IN::PTR) do |transaction|
             name, ttl = @@cloud.lookup_name(transaction.name)
             name += ".#{@@options[:domain]}" if @@options[:domain]
             transaction.respond!(Resolv::DNS::Name.create("#{name}."), :ttl => ttl)

metadata

@@ -1,89 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: murakumo
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 7
-  version: 0.4.7
 platform: ruby
-authors: 
+authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubydns
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 3
-        - 4
-        version: 0.3.4
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rgossip2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: rgossip2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: optopus
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 2
-        - 3
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: optopus
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 description: 
 email: sgwr_dts@yahoo.co.jp
-executables: 
+executables:
 - murakumo
 - mrkmctl
 - murakumo-install-init-script
@@ -94,80 +88,69 @@ executables:
 - murakumo-attach-ec2-attach-interface
 - murakumo-show-ec2-interfaces
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
-- bin/murakumo-show-ec2-private-ip-addresses
 - bin/murakumo-install-init-script
+- bin/murakumo
 - bin/murakumo-show-ec2-tags
 - bin/murakumo-show-ec2-interfaces
+- bin/murakumo-show-ec2-private-ip-addresses
+- bin/mrkmctl
+- bin/murakumo-attach-ec2-attach-interface
 - bin/murakumo-show-ip-address
 - bin/murakumo-show-ec2-instances
-- bin/murakumo-attach-ec2-attach-interface
-- bin/mrkmctl
-- bin/murakumo
-- lib/cli/murakumo_options.rb
-- lib/cli/mrkmctl.rb
-- lib/cli/mrkmctl_options.rb
 - lib/cli/murakumo.rb
 - lib/cli/murakumo_initializer_context.rb
-- lib/srv/murakumo_health_check_notifier.rb
-- lib/srv/murakumo_balancer.rb
-- lib/srv/murakumo_server.rb
-- lib/srv/murakumo_health_checker.rb
-- lib/srv/murakumo_cloud.rb
-- lib/srv/murakumo_activity_check_notifier.rb
-- lib/srv/murakumo_activity_checker.rb
-- lib/srv/murakumo_health_check_context.rb
-- lib/util/murakumo_ec2_private_ip_addresses.rb
-- lib/util/murakumo_ec2_instances.rb
-- lib/util/murakumo_ec2_client.rb
-- lib/util/murakumo_ec2_tags.rb
+- lib/cli/mrkmctl.rb
+- lib/cli/mrkmctl_options.rb
+- lib/cli/murakumo_options.rb
 - lib/util/murakumo_self_ip_address.rb
+- lib/util/murakumo_ec2_tags.rb
+- lib/util/murakumo_ec2_private_ip_addresses.rb
 - lib/util/murakumo_ec2_interfaces.rb
 - lib/util/murakumo_ec2_attach_interface.rb
+- lib/util/murakumo_ec2_instances.rb
+- lib/util/murakumo_ec2_client.rb
+- lib/srv/murakumo_activity_checker.rb
+- lib/srv/murakumo_cloud.rb
+- lib/srv/murakumo_balancer.rb
+- lib/srv/murakumo_health_check_context.rb
+- lib/srv/murakumo_server.rb
+- lib/srv/murakumo_activity_check_notifier.rb
+- lib/srv/murakumo_health_check_notifier.rb
+- lib/srv/murakumo_health_checker.rb
 - lib/misc/murakumo_const.rb
 - etc/murakumo-update-config-for-ec2
-- etc/gai.conf.example
-- etc/attach_if.sh.example
-- etc/murakumo.yml.example
 - etc/dhclient-script.patch
-- etc/murakumo-init.rb.for-ec2
 - etc/murakumo.server
+- etc/murakumo.yml.example
+- etc/attach_if.sh.example
+- etc/murakumo-init.rb.for-ec2
+- etc/gai.conf.example
 homepage: https://github.com/cookpad/murakumo/wiki
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.
+summary: Murakumo is the internal DNS server which manages name information using
+  a gossip protocol.
 test_files: []
-