dust-deploy 0.13.4 → 0.13.5

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.13.5
+------------
+
+-  adds postfix recipe (for maintaining main.cf and master.cf)
+-  adds dovecot recipe
+
+
 0.13.4
 ------------
 

data/lib/dust/recipes/dovecot.rb

@@ -0,0 +1,54 @@
+class Dovecot < Recipe
+  desc 'dovecot:deploy', 'installs and configures dovecot imap/pop server'
+  def deploy
+    @config = default_config.merge @config
+    @config.boolean_to_string! # parse 'no/yes' as string, not as boolean
+
+    # stip non-config-file values from @config
+    service = @config.delete('service')
+    package = @config.delete('package')   
+    etc_dir = @config.delete('etc_dir')
+    
+    return unless @node.install_package(package)
+
+    @config.each do |name, config|
+      msg = @node.messages.add("configuring #{name}")
+      msg.ok
+      @node.write "#{etc_dir}/#{name}", generate_config(config)
+    end
+
+    @node.restart_service(service) if @options.restart?
+  end
+
+
+  private
+
+  def generate_config(config, indent = 0)
+    s = ''
+    config.each do |key, value|
+      if value.is_a? Hash
+        s << '    ' * indent
+        s << "#{key} {\n"
+        s << generate_config(value, indent + 1)
+        s << '    ' * indent
+        s << "}\n"
+      else
+        s << '    ' * indent
+        s << "#{key} = #{value}\n"
+      end
+    end
+
+    s
+  end
+
+  # default dust configuration
+  def default_config
+    { 'package' => 'dovecot', 'etc_dir' => '/etc/dovecot', 'service' => 'dovecot' }
+  end
+
+  # master.cf default service configuration
+  def default_service(service)
+    { 'type' => 'unix', 'private' => '-', 'unpriv' => '-', 'chroot' => '-',
+      'wakeup' => '-', 'maxproc' => '-', 'command' => service }
+  end
+end

data/lib/dust/recipes/postfix.rb

@@ -0,0 +1,52 @@
+class Postfix < Recipe
+  desc 'postfix:deploy', 'installs and configures postfix mail server'
+  def deploy
+    @config = default_config.merge @config
+    @config.boolean_to_string! # parse 'no/yes' as string, not as boolean
+    
+    return unless @node.install_package @config['package']
+
+    if @config['main.cf']
+      main_cf = ''
+      @config['main.cf'].each { |key, value| main_cf << "#{key} = #{value}\n" }
+      @node.write "#{@config['etc_dir']}/main.cf", main_cf
+    end
+
+    if @config['master.cf']
+      master_cf = "# service\ttype\tprivate\tunpriv\tchroot\twakeup\tmaxproc\tcommand\n\n"
+      @config['master.cf'].each do |s|
+        return @node.messages.add("service missing: #{s.inspect}").failed unless s['service']
+        s = default_service(s['service']).merge s
+
+        master_cf << "#{s['service']}\t" +
+                     "#{s['service'].length > 7 ? '' : "\t"}" + # adds second tab if needed
+                     "#{s['type']}\t#{s['private']}\t" +
+                     "#{s['unpriv']}\t#{s['chroot']}\t#{s['wakeup']}\t" +
+                     "#{s['maxproc']}\t#{s['command']}\n"
+        if s['args']
+          s['args'].to_array.each { |a|  master_cf << "  #{a}\n" }
+          master_cf << "\n"
+        end
+      end
+
+      @node.write "#{@config['etc_dir']}/master.cf", master_cf
+    end
+
+    @node.restart_service @config['service'] if @options.restart?
+    @node.reload_service @config['service'] if @options.reload?
+  end
+
+
+  private
+
+  # default dust configuration
+  def default_config
+    { 'package' => 'postfix', 'etc_dir' => '/etc/postfix', 'service' => 'postfix' }
+  end
+
+  # master.cf default service configuration
+  def default_service(service)
+    { 'type' => 'unix', 'private' => '-', 'unpriv' => '-', 'chroot' => '-',
+      'wakeup' => '-', 'maxproc' => '-', 'command' => service }
+  end
+end

data/lib/dust/server.rb

@@ -83,10 +83,12 @@ module Dust
           abort "FAILED: couldn't execute command (ssh.channel.exec)" unless success
 
           channel.on_data do |ch, data|
+
             # only send password if sudo mode is enabled,
-            # sudo password string matches
             # and only send password once in a session (trying to prevent attacks reading out the password)
-            if @node['sudo'] and data =~ /^\[sudo\] password for #{@node['user']}/ and not sudo_authenticated
+            if @node['sudo'] and not sudo_authenticated
+              # skip everything till password is prompted
+              next unless data =~ /^\[sudo\] password for #{@node['user']}/
               channel.send_data "#{@node['password']}\n"
               sudo_authenticated = true
             else

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.4"
+  VERSION = "0.13.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -174,6 +174,7 @@ files:
 - lib/dust/recipes/cups_client.rb
 - lib/dust/recipes/debsecan.rb
 - lib/dust/recipes/dnsmasq.rb
+- lib/dust/recipes/dovecot.rb
 - lib/dust/recipes/duplicity.rb
 - lib/dust/recipes/etc_hosts.rb
 - lib/dust/recipes/hash_check.rb
@@ -189,6 +190,7 @@ files:
 - lib/dust/recipes/ntpd.rb
 - lib/dust/recipes/pacemaker.rb
 - lib/dust/recipes/packages.rb
+- lib/dust/recipes/postfix.rb
 - lib/dust/recipes/postgres.rb
 - lib/dust/recipes/rc_local.rb
 - lib/dust/recipes/redis.rb