dust-deploy 0.10.6 → 0.10.7

data/changelog.md

@@ -1,6 +1,21 @@
 Changelog
 =============
 
+0.10.7
+------------
+
+-  sshd recipe supports conditional blocks
+
+    recipes:
+      sshd:
+        Match:
+          User john:
+            ChrootDirectory: /srv
+            ForceCommand: internal-sftp
+            AllowTcpForwarding: no
+            X11Forwarding: no
+
+
 0.10.6
 ------------
 

data/lib/dust/helper.rb

@@ -41,25 +41,31 @@ class Hash
     self
   end
 
-  
+
   # converts each value to an array, so .each and .combine won't get hickups
   def values_to_array!
-    self.keys.each { |k| self[k] = [ self[k] ] unless self[k].is_a? Array }    
+    self.keys.each { |k| self[k] = [ self[k] ] unless self[k].is_a? Array }
   end
-  
+
   # converts each value that is a boolean to 'yes' resp. 'no' strings
   def boolean_to_string!
-    self.each { |k, v| self[k] = v ? 'yes' : 'no' if v.is_a? TrueClass or v.is_a? FalseClass }
-  end 
+    self.each do |k, v|
+      self[k] = 'yes' if v.is_a? TrueClass
+      self[k] = 'no' if v.is_a? FalseClass
+
+      # recursion
+      v.boolean_to_string! if v.is_a? Hash
+    end
+  end
 end
 
 
 class String
   # stole this from Afz902k who posted something similar at stackoverflow.com
-  # adds ability to check if a class with the name of a string exists  
+  # adds ability to check if a class with the name of a string exists
   def to_class
     Kernel.const_get self.capitalize
-  rescue NameError 
+  rescue NameError
     nil
   end
 
@@ -75,7 +81,7 @@ module Dust
   # converts string to kilobytes (rounded)
   def self.convert_size s
     i, unit = s.split(' ')
-  
+
     case unit.downcase
     when 'kb'
       return i.to_i

data/lib/dust/recipes/sshd.rb

@@ -1,7 +1,7 @@
 class Sshd < Recipe
-  
+
   desc 'sshd:deploy', 'installs and configures the ssh server'
-  def deploy 
+  def deploy
     if @node.uses_pacman?
       return unless @node.install_package 'openssh'
     else
@@ -9,7 +9,6 @@ class Sshd < Recipe
     end
 
     generate_default_config
-    @config.values_to_array!
 
     check_hostkeys
     apply_configuration
@@ -28,7 +27,7 @@ class Sshd < Recipe
       'HostKey' => [ '/etc/ssh/ssh_host_dsa_key',
                      '/etc/ssh/ssh_host_ecdsa_key',
                       '/etc/ssh/ssh_host_rsa_key' ],
-      'PasswordAuthentication' => 'yes', 
+      'PasswordAuthentication' => 'yes',
       'ChallengeResponseAuthentication' => 'no',
       'X11Forwarding' => 'yes',
       'UsePAM' => 'yes',
@@ -58,9 +57,25 @@ class Sshd < Recipe
 
   def apply_configuration
     @sshd_config = ''
-    @config.each do |key, values|
-      values.each { |value| @sshd_config << "#{key} #{value}\n" }
+    conditional_blocks = ''
+
+    @config.each do |key, value|
+
+      # hashes are conditional blocks
+      # which have to be placed at the end of the file
+      if value.is_a? Hash
+        value.each do |k, v|
+          conditional_blocks << "#{key} #{k}\n"
+          v.to_array.each { |x, y| conditional_blocks << "    #{x} #{y}\n" }
+        end
+
+      else
+        value.to_array.each { |value| @sshd_config << "#{key} #{value}\n" }
+      end
     end
+
+    # append conditional blocks
+    @sshd_config << conditional_blocks
   end
 
   def check_hostkeys

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.10.6"
+  VERSION = "0.10.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 +02:00
+date: 2012-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency