dust-deploy 0.13.11 → 0.13.12

data/changelog.md

@@ -1,6 +1,20 @@
 Changelog
 =============
 
+0.13.12
+------------
+
+-  nginx recipe displays error message when configtest fails
+-  nginx recipe supports specifying package to install
+-  nginx recipe now uses binding for deploying nginx.conf (so you can call node.functions)
+
+    recipes:
+      nginx:
+        package: nginx-extras
+        sites:
+          enabled: reverse-proxy
+
+
 0.13.11
 ------------
 

data/lib/dust/recipes/duplicity.rb

@@ -30,6 +30,9 @@ class Duplicity < Recipe
       # check whether we need ncftp
       @node.install_package 'ncftp' if config['backend'].include? 'ftp://'
 
+      # scp backend on centos needs python-paramiko
+      @node.install_package 'python-paramiko' if @node.uses_rpm? and config['backend'].include? 'scp://'
+
       # scp backend on centos needs python-pexpect (not needed anymore for newer systems)
       # @node.install_package 'python-pexpect' if config['backend'].include? 'scp://' and @node.uses_rpm?
 

data/lib/dust/recipes/iptables.rb

@@ -49,6 +49,7 @@ class Iptables < Recipe
   # install iptables
   def install
     return false unless @node.install_package 'iptables'
+    return false unless @node.install_package 'ip6tables' if @node.uses_opkg?
     return false unless @node.install_package 'iptables-persistent' if @node.uses_apt?
     return false unless @node.install_package 'iptables-ipv6' if @node.uses_rpm? and not @node.is_fedora?
     true
@@ -285,6 +286,12 @@ class Iptables < Recipe
       @node.autostart_service('iptables-persistent') if @node.uses_apt?
     end
 
+    # disable firewall hotplug scripts on openwrt
+    if @node.uses_opkg?
+      msg = @node.messages.add('disabling firewall hotplug scripts in /etc/hotplug.d/firewall')
+      msg.parse_result(@node.exec('chmod -x /etc/hotplug.d/firewall/*')[:exit_code])
+    end
+
     @node.write(target, @script, :quiet => true)
     @node.chmod('0600', target)
   end

data/lib/dust/recipes/nginx.rb

@@ -1,22 +1,25 @@
 class Nginx < Recipe
   desc 'nginx:deploy', 'installs and configures nginx web server'
   def deploy
+    # default package to install
+    @config['package'] ||= 'nginx'
+
     # abort if nginx cannot be installed
-    return unless @node.install_package 'nginx'
+    return unless @node.install_package(@config['package'])
 
-    @node.deploy_file "#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf'
+    @node.deploy_file("#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf', :binding => binding)
 
     # remove old sites that may be present
     msg = @node.messages.add('deleting old sites in /etc/nginx/sites-*')
     @node.rm '/etc/nginx/sites-*/*', :quiet => true
     msg.ok
 
-    @config.each do |state, sites|
+    @config['sites'].each do |state, sites|
       sites.to_array.each do |site|
-        @node.deploy_file "#{@template_path}/sites/#{site}", "/etc/nginx/sites-available/#{site}", :binding => binding
+        @node.deploy_file("#{@template_path}/sites/#{site}", "/etc/nginx/sites-available/#{site}", :binding => binding)
 
         # symlink to sites-enabled if this is listed as an enabled site
-        if state == 'sites-enabled'
+        if state == 'enabled'
           msg = @node.messages.add("enabling #{site}", :indent => 2)
           msg.parse_result(@node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code])
         end
@@ -25,11 +28,12 @@ class Nginx < Recipe
 
     # check configuration and restart nginx
     msg = @node.messages.add('checking nginx configuration')
-    if @node.exec('/etc/init.d/nginx configtest')[:exit_code] == 0
+    ret = @node.exec('/etc/init.d/nginx configtest')
+    if ret[:exit_code] == 0
       msg.ok
       @node.restart_service('nginx') if options.restart?
     else
-      msg.failed
+      msg.failed("\n" + ret[:stderr])
     end
   end
 

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.11"
+  VERSION = "0.13.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.11
+  version: 0.13.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json