dtk-node-agent 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c1bb1dcb2e60109da5f3a8e43fb88b4db57e96
-  data.tar.gz: 4e7149295c373299461fc594b0dd458e9ec96160
+  metadata.gz: 2ea2bafe1e5ae5c8816111cfc2df9e8775926dce
+  data.tar.gz: c19723f600e554585e351376d1526cb72809bbb6
 SHA512:
-  metadata.gz: 7d284aa8af086ebb026521b6a00430adb878b24bc56ed450b9bc1c32140145adeaf61c3a1e5c3a63a3b3542535bde304361041797ba6951fe39dda3059d47aea
-  data.tar.gz: fd91a8a50fea2d018782bfa6aff9fb3738789367c3def55fe60aab90454d451ead53e3b43dc691916854a2c704b3682fad4e8a7f3bf3a851273a154126a36053
+  metadata.gz: 6cd227f3e46659d63eb56fc6e3c189c64d88f7cf35563199d214502623686781bad9329a514c25d1739e83e49113f576a96f01464cd55cf2e5c856bd1b336787
+  data.tar.gz: be7e5eb2bac7ab0c54a47edb15a897694131fa36e5a439e07487665842ed582d9abd2492e6c761faf32900130133be8b38f2a997b9b0e41be93be00a5c08e11b

data/lib/config/install.config

@@ -15,5 +15,6 @@
   :upgrades => {
     :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced', 'monit'],
     :debian => ['openssl', 'bash', 'emacs23-nox', 'vim', 'monit']
-  }
+  },
+  :arbiter_branch => 'stable'
 }

data/lib/dtk-node-agent/installer.rb

@@ -45,7 +45,7 @@ module DTK
         if @osfamily == 'debian'
               # set up apt and install packages
               shell "apt-get update --fix-missing"
-              shell "apt-get install -y build-essential wget curl git"
+              shell "apt-get install -y build-essential wget curl git libicu-dev zlib1g-dev"
               # install upgrades
               Array(CONFIG[:upgrades][:debian]).each do |package|
                 shell "apt-get install -y #{package}"
@@ -66,7 +66,7 @@ module DTK
               # pin down the puppetlabs apt repo
               FileUtils.cp("#{base_dir}/src/etc/apt/preferences.d/puppetlabs", "/etc/apt/preferences.d/puppetlabs")
             elsif @osfamily == 'redhat'
-              shell "yum -y install yum-utils wget curl"
+              shell "yum -y install yum-utils wget curl libicu-devel zlib-devel"
               # do a full upgrade
               shell "yum -y update"
               case @osmajrelease
@@ -112,22 +112,21 @@ module DTK
 
             puts "Installing DTK Arbiter"
             install_arbiter
-          end       
-
+          end
 
           private
-          
+
           def self.parse(argv)
             options = {}
             parser = OptionParser.new do |opts|
               opts.banner = <<-BANNER
               usage:
-              
+
               dtk-node-agent [-p|--puppet-version] [-v|--version]
               BANNER
               opts.on("-d",
                 "--debug",
-                "enable debug mode")  { |v| options[:debug] = true }      
+                "enable debug mode")  { |v| options[:debug] = true }
               opts.on_tail("-v",
                 "--version",
                 "Print the version and exit.") do
@@ -145,7 +144,7 @@ module DTK
             parser.parse!(argv)
 
             options
-            
+
           rescue OptionParser::InvalidOption => e
             $stderr.puts e.message
             exit(12)
@@ -203,7 +202,8 @@ module DTK
           end
 
           def self.install_arbiter
-            shell "git clone -b DTK-2654 https://github.com/dtk/dtk-arbiter /usr/share/dtk/dtk-arbiter"
+            arbiter_branch = CONFIG[:arbiter_branch] || 'stable'
+            shell "git clone -b #{arbiter_branch} https://github.com/dtk/dtk-arbiter /usr/share/dtk/dtk-arbiter"
             Dir.chdir "/usr/share/dtk/dtk-arbiter"
             shell "bundle install --without development"
             puts "Installing dtk-arbiter init script"
@@ -214,7 +214,9 @@ module DTK
             puts "Installing dtk-arbiter monit config."
             monit_cfg_path = (@osfamily == 'debian') ? "/etc/monit/conf.d" : "/etc/monit.d"
             set_init("monit")
-            FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter") if File.exist?(monit_cfg_path)          
+            logrotate_cfg_path = "/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.logrotate"
+            FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter") if File.exist?(monit_cfg_path)
+            FileUtils.cp(logrotate_cfg_path, "/etc/logrotate.d/dtk-arbiter") if File.exist?(logrotate_cfg_path)
           end
     end
   end

data/lib/dtk-node-agent/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 #
 module DtkNodeAgent
-  VERSION="0.10.4"
+  VERSION="0.10.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.