murakumo 0.1.3 → 0.1.4

data/README

@@ -16,8 +16,7 @@ https://bitbucket.org/winebarrel/murakumo
 == Install
 
   shell> gem install murakumo
-  shell> cp /usr/local/lib/ruby/gems/1.8/gems/murakumo-*/etc/murakumo.server /etc/init.d/murakumo
-  shell> chmod 755 /etc/init.d/murakumo
+  shell> murakumo-install-init-script
   shell> /etc/init.d/murakumo configure
   shell> /etc/init.d/murakumo start
   shell> dig @127.0.0.1 <any_hostname>

data/bin/murakumo-install-init-script

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+MRKM_DIR = 'murakumo-0.1.4'
+INIT_D_DIR = '/etc/init.d'
+
+begin
+  require 'rbconfig'
+  require 'rubygems'
+rescue LoadError
+end
+
+gem_dir = nil
+
+if defined?(Gem)
+  gem_dir = "#{Gem.dir}/gems"
+elsif defined?(RbConfig)
+  gem_dir = RbConfig::CONFIG["rubylibdir"].sub(/\d+\.\d+\Z/) {|m| "gems/#{m}/gems"}
+else
+  $stderr.puts 'error: gem dir is not found.'
+  exit 1
+end
+
+`cp -i #{gem_dir}/#{MRKM_DIR}/etc/murakumo.server #{INIT_D_DIR}/murakumo`
+`chmod 755 #{INIT_D_DIR}/murakumo`

data/etc/dhclient-script.patch

@@ -0,0 +1,13 @@
+--- /sbin/dhclient-script.orig	2011-04-13 07:30:32.000000000 +0900
++++ /sbin/dhclient-script	2011-11-20 00:18:31.000000000 +0900
+@@ -65,6 +65,10 @@
+     if [ -n "$RES_OPTIONS" ]; then
+       echo options $RES_OPTIONS >> $rscf
+     fi
++    CURRENT_RUN_LEVEL=(`/sbin/runlevel`)
++    if [ -n "${CURRENT_RUN_LEVEL[1]}" -a ${CURRENT_RUN_LEVEL[1]} -ge 3 ]; then
++      echo nameserver 127.0.0.1 >> $rscf
++    fi
+     for nameserver in $new_domain_name_servers; do
+       echo nameserver $nameserver >> $rscf
+     done

data/etc/murakumo-update-config-for-ec2

@@ -0,0 +1,33 @@
+#!/bin/sh
+CURL='curl --retry 3 --retry-delay 0 --silent --fail'
+IP_ADDR=`$CURL http://169.254.169.254/1.0/meta-data/local-ipv4`
+CONF=/etc/murakumo.yml
+
+if [ $? -ne 0 -o -z "$IP_ADDR" ]; then
+  exit 1
+fi
+
+if [ `grep ^host $CONF | egrep "host: $IP_ADDR\b" | wc -l` -eq 1 ]; then
+  exit
+fi
+
+## gets a host name from user data.
+#HOSTNAME=`$CURL http://169.254.169.254/1.0/user-data`
+
+## gets a host name from name tag.
+#export JAVA_HOME=/usr/java/default
+#export EC2_HOME=/opt/ec2-api-tools
+#EC2_PRIVATE_KEY=
+#EC2_CERT=
+#REGION=ap-northeast-1
+#EC2DIN=$EC2_HOME/bin/ec2-describe-instances
+#HOSTNAME=`$EC2DIN -K $EC2_PRIVATE_KEY -C $EC2_CERT --region $REGION -F "private-ip-address=$IP_ADDR" | awk -F'\t' '$1 == "TAG" && $4 == "Name" {print $5}'`
+
+## gets a host name from meta data.
+HOSTNAME=`$CURL http://169.254.169.254/1.0/meta-data/hostname`
+
+if [ $? -ne 0 -o -z "$HOSTNAME" ]; then
+  exit 1
+fi
+
+sed -i.bak -r "s|^host:.*|host: $IP_ADDR, $HOSTNAME|" /etc/murakumo.yml

data/etc/murakumo.server

@@ -1,5 +1,5 @@
 #!/bin/sh
-# chkconfig: 345 64 36
+# chkconfig: 345 11 89
 # description: The internal DNS server which manages name information using a gossip protocol.
 # processname: /usr/local/bin/murakumo
 # config: /etc/murakumo.yml
@@ -13,6 +13,8 @@ if [ "$1" != "configure"  -a ! -e "$conf" ]; then
   exit 1
 fi
 
+#/usr/local/sbin/murakumo-update-config-for-ec2
+
 case "$1" in
 start)
   $prog -c $conf -d start
@@ -64,6 +66,7 @@ resolver: $resolver
 max-ip-number: 8
 
 #initial-nodes: 10.11.12.14, 10.11.12.15
+#domain: ap-northeast-1.compute.internal
 
 host: $ip_addr, $hostname, 60
 

data/etc/murakumo.yml.sample

@@ -9,6 +9,7 @@ resolver: 8.8.8.8
 max-ip-num: 8
 
 #initial-nodes: 10.11.12.14, 10.11.12.15
+#domain: ap-northeast-1.compute.internal
 
 # Ip address, hostname, ttl
 host: 10.11.12.13, my-host, 60

data/lib/cli/murakumo_options.rb

@@ -81,6 +81,11 @@ def murakumo_parse_args
       invalid_argument if value < 1
     end
 
+    desc 'suffix of a host name'
+    option :domain, '-b', '--domain DOMAIN' do |value|
+      invalid_argument if (value || '').strip.empty?
+    end
+
     desc 'command of daemonize: {start|stop|restart|status}'
     option :daemon, '-d', '--daemon CMD', :type => [:start, :stop, :restart, :status]
 

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -70,7 +70,7 @@ module Murakumo
 
         if health_check.kind_of?(Hash)
           health_check.each do |name, conf|
-            checker = HealthChecker.new(name, self, options[:logger], conf)
+            checker = HealthChecker.new(name.downcase, self, options[:logger], conf)
             @health_checkers[name] = checker
             # ヘルスチェックはまだ起動しない
           end
@@ -105,6 +105,7 @@ module Murakumo
         ]},
         :socket        => 'socket',
         :max_ip_num    => 'max-ip-num',
+        :domain        => 'domain',
         :log_path      => 'log-path',
         :log_level     => 'log-level',
         :gossip_port   => 'gossip-port',
@@ -343,6 +344,9 @@ module Murakumo
       # 名前は小文字に変換
       name = name.downcase
 
+      # ドメインが指定されていたら削除
+      name.sub!(/\.#{Regexp.escape(@options[:domain])}\Z/i, '') if @options[:domain]
+
       # シングルスレッドェ…
       @address_records = @db.execute(<<-EOS, name, ACTIVE)
         SELECT ip_address, ttl, priority FROM records

data/lib/srv/murakumo_health_checker.rb

@@ -9,8 +9,7 @@ module Murakumo
   class HealthChecker
 
     def initialize(name, cloud, logger, options)
-      # 名前は小文字に変換
-      @name = name.downcase
+      @name = name
       @cloud = cloud
       @logger = logger
 

data/lib/srv/murakumo_server.rb

@@ -34,6 +34,9 @@ module Murakumo
 
           on(:start) do
             if @@options[:socket]
+              # 既存のソケットファイルは削除
+              FileUtils.rm_f(@@options[:socket])
+
               # ServerクラスをDRuby化
               DRb.start_service("drbunix:#{@@options[:socket]}", @@cloud)
               at_exit { FileUtils.rm_f(@@options[:socket]) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - winebarrel
@@ -86,12 +86,14 @@ email: sgwr_dts@yahoo.co.jp
 executables: 
 - murakumo
 - mrkmctl
+- murakumo-install-init-script
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - README
+- bin/murakumo-install-init-script
 - bin/mrkmctl
 - bin/murakumo
 - lib/cli/murakumo_options.rb
@@ -103,7 +105,9 @@ files:
 - lib/srv/murakumo_health_checker.rb
 - lib/srv/murakumo_cloud.rb
 - lib/misc/murakumo_const.rb
+- etc/murakumo-update-config-for-ec2
 - etc/murakumo.yml.sample
+- etc/dhclient-script.patch
 - etc/murakumo.server
 homepage: https://bitbucket.org/winebarrel/murakumo
 licenses: []