dust-deploy 0.10.2 → 0.10.3

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.10.3
+------------
+
+-  the hash_check recipe now supports python3
+-  introduces basic archlinux support
+
+
 0.10.2
 ------------
 

data/lib/dust/recipes/hash_check.rb

@@ -22,7 +22,7 @@ class HashCheck < Recipe
         # python was imho the best solution to generate /etc/shadow hashes.
         # mkpasswd doesn't work on centos-like machines :/
         # and python is more likely installed than ruby
-        ret = @node.exec("python -c \"import crypt; print crypt.crypt('#{password}', '\\$#{method}\\$#{salt}\\$')\"")
+        ret = @node.exec("python -c \"import crypt; print(crypt.crypt('#{password}', '\\$#{method}\\$#{salt}\\$'));\"")
 
         unless ret[:exit_code] == 0
           ::Dust.print_failed 'error during hash creation (is python installed?)'

data/lib/dust/recipes/sshd.rb

@@ -2,7 +2,11 @@ class Sshd < Recipe
   
   desc 'sshd:deploy', 'installs and configures the ssh server'
   def deploy 
-    return unless @node.install_package 'openssh-server'
+    if @node.uses_pacman?
+      return unless @node.install_package 'openssh'
+    else
+      return unless @node.install_package 'openssh-server'
+    end
 
     generate_default_config
     @config.values_to_array!
@@ -69,8 +73,11 @@ class Sshd < Recipe
   end
 
   def restart_daemon
-    daemon = 'ssh' if @node.uses_apt?
-    daemon = 'sshd' if @node.uses_rpm?
+    if @node.uses_apt?
+      daemon = 'ssh'
+    else
+      daemon = 'sshd'
+    end
 
     @node.restart_service daemon if @options.restart
     @node.reload_service daemon if @options.reload

data/lib/dust/recipes/sysctl.rb

@@ -1,8 +1,10 @@
 class Sysctl < Recipe
   desc 'sysctl:deploy', 'configures sysctl'
   def deploy
-    # only debian derivatives are supported at the moment, since we need support for /etc/sysctl.d/
-    return ::Dust.print_warning 'sysctl configuration not supported for your linux distribution' unless @node.uses_apt?
+    # we need support for /etc/sysctl.d/
+    unless @node.dir_exists? '/etc/sysctl.d/'
+      return ::Dust.print_warning 'sysctl configuration not supported for your linux distribution'
+    end
 
     # seperate templates from sysctls
     sysctls = @config.clone

data/lib/dust/server.rb

@@ -281,6 +281,8 @@ module Dust
           return Dust.print_ok '', options unless exec("qlist -I #{package}")[:stdout].empty?
         elsif uses_rpm?
           return Dust.print_ok '', options if exec("rpm -q #{package}")[:exit_code] == 0
+        elsif uses_pacman?
+          return Dust.print_ok '', options if exec("pacman -Q #{package}")[:exit_code] == 0
         end
       end
 
@@ -303,6 +305,8 @@ module Dust
         exec "#{options[:env]} emerge #{package}"
       elsif uses_rpm?
         exec "yum install -y #{package}"
+      elsif uses_pacman?
+        exec "echo y |pacman -S #{package}"
       else
         puts
         return Dust.print_failed "install_package only supports apt, emerge and yum systems at the moment",
@@ -327,6 +331,8 @@ module Dust
         Dust.print_result exec("emerge --unmerge #{package}")[:exit_code], options
       elsif uses_rpm?
         Dust.print_result exec("yum erase -y #{package}")[:exit_code], options
+      elsif uses_pacman?
+        Dust.print_result exec("echo y |pacman -R #{package}")[:exit_code], options
       else
         Dust.print_failed '', options
       end
@@ -348,6 +354,8 @@ module Dust
         # yum returns != 0 if packages that need to be updated are found
         # we don't want that this is producing an error
         ret[:exit_code] = 0 if ret[:exit_code] == 100
+      elsif uses_pacman?
+        ret = exec 'pacman -Sy', options
       else
         return Dust.print_failed '', options
       end
@@ -375,6 +383,9 @@ module Dust
         ret = exec 'emerge -uND @world', options
       elsif uses_rpm?
         ret = exec 'yum upgrade -y', options
+      elsif uses_pacman?
+        # pacman has no --yes option that i know of, so echoing y
+        ret = exec 'echo y |pacman -Su', options
       else
         Dust.print_failed 'system not (yet) supported', options
         return false
@@ -414,6 +425,14 @@ module Dust
       Dust.print_msg 'determining whether node uses emerge', options
       @uses_emerge = Dust.print_result exec('test -e /etc/gentoo-release')[:exit_code], options
     end
+
+    def uses_pacman? options = {}
+      options = default_options(:quiet => true).merge options
+
+      return @uses_pacman if defined? @uses_pacman
+      Dust.print_msg 'determining whether node uses pacman', options
+      @uses_pacman = Dust.print_result exec('test -e /etc/arch-release')[:exit_code], options
+    end
   
     def is_os? os_list, options = {}
       options = default_options(:quiet => true).merge options
@@ -472,6 +491,13 @@ module Dust
       return false unless uses_rpm?
       is_os? ['fedora'], options
     end
+
+    def is_arch? options = {}
+      options = default_options(:quiet => true).merge options
+
+      return false unless uses_pacman?
+      is_os? ['archlinux'], options
+    end
   
     def is_executable? file, options = {}
       options = default_options.merge options
@@ -533,6 +559,10 @@ module Dust
         Dust.print_msg "#{command}ing #{service} (via sysvconfig)", options
         ret = exec("service #{service} #{command}")
 
+      elsif file_exists? '/usr/sbin/rc.d', :quiet => true
+        Dust.print_msg "#{command}ing #{service} (via rc.d)", options
+        ret = exec("rc.d #{command} #{service}")
+
       else
         Dust.print_msg "#{command}ing #{service} (via initscript)", options
         ret = exec("/etc/init.d/#{service} #{command}")

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-11 00:00:00 +02:00
+date: 2012-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency