dust-deploy 0.14.0 → 0.14.1

data/changelog.md

@@ -1,6 +1,16 @@
 Changelog
 =============
 
+0.14.1
+------------
+
+-  removes ntpd recipe
+-  adds chrony recipe
+
+    recipes:
+      chrony: enabled
+
+
 0.14.0
 ------------
 

data/lib/dust/recipes/chrony.rb

@@ -0,0 +1,71 @@
+class Chrony < Recipe
+  desc 'chrony:deploy', 'installs and configures chrony'
+  def deploy
+    # warn if other ntp package is installed
+    [ 'openntpd', 'ntp' ].each do |package|
+      if @node.package_installed?(package, :quiet => true)
+        @node.messages.add("#{package} installed, might conflict with chrony, might get deleted").warning
+      end
+    end
+
+    # install package
+    @node.install_package('chrony')
+
+    # set config file and service name according to distribution used
+    if @node.uses_apt?
+      config = '/etc/chrony/chrony.conf'
+      service = 'chrony'
+    elsif @node.uses_rpm?
+      config = '/etc/chrony.conf'
+      service = 'chronyd'
+    end
+
+    @node.write(config, generate_config)
+
+    @node.autostart_service(service)
+    @node.restart_service(service) if options.restart?
+  end
+
+
+  private
+
+  # generate chrony.conf
+  def generate_config
+    @config = default_options.merge(@config)
+    file = ''
+    @config.each do |key, value|
+      Array(value).each { |v| file << "#{key} #{v}\n" }
+    end
+    file
+  end
+
+  # default chrony.conf options
+  def default_options
+    options = {
+      'server' => [
+        '0.pool.ntp.org minpoll 8',
+        '1.pool.ntp.org minpoll 8',
+        '2.pool.ntp.org minpoll 8',
+        '3.pool.ntp.org minpoll 8'
+      ],
+      'commandkey' => 1,
+      'logdir' => '/var/log/chrony',
+      'logchange' => 0.5,
+      'maxupdateskew' => 100.0,       # Stop bad estimates upsetting machine clock.
+      'dumponexit' => '',             # Dump measurements when daemon exits.
+      'dumpdir' => '/var/lib/chrony',
+      'rtconutc' => ''                # CMOS clock is on UTC (GMT)
+    }
+
+    if @node.uses_rpm?
+      options['keyfile'] = '/etc/chrony.keys'
+      options['driftfile'] = '/var/lib/chrony/drift'
+    elsif @node.uses_apt?
+      options['keyfile'] = '/etc/chrony/chrony.keys'
+      options['driftfile'] = '/var/lib/chrony/chrony.drift'
+    end
+
+    options
+  end
+end
+

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -169,6 +169,7 @@ files:
 - lib/dust/recipe.rb
 - lib/dust/recipes/aliases.rb
 - lib/dust/recipes/apt.rb
+- lib/dust/recipes/chrony.rb
 - lib/dust/recipes/cjdroute.rb
 - lib/dust/recipes/cron.rb
 - lib/dust/recipes/cups_client.rb
@@ -187,7 +188,6 @@ files:
 - lib/dust/recipes/mysql.rb
 - lib/dust/recipes/newrelic.rb
 - lib/dust/recipes/nginx.rb
-- lib/dust/recipes/ntpd.rb
 - lib/dust/recipes/pacemaker.rb
 - lib/dust/recipes/packages.rb
 - lib/dust/recipes/postfix.rb

data/lib/dust/recipes/ntpd.rb

@@ -1,19 +0,0 @@
-class Ntpd < Recipe
-  desc 'ntpd:deploy', 'installs and configures ntpd'
-  def deploy
-    # warn if other ntp package is installed
-    [ 'openntpd', 'chrony' ].each do |package|
-      if @node.package_installed? package, :quiet => true
-        @node.messages.add("#{package} installed, might conflict with ntpd, might get deleted").warning
-      end
-    end
-
-    @node.install_package 'ntp'
-
-    service = @node.uses_apt? ? 'ntp' : 'ntpd'
-
-    @node.autostart_service service
-    @node.restart_service service if options.restart?
-  end
-end
-