Merge pull request #10 from haw-hh-ai-lab/add_standalone_master_record

Add standalone master record

Author: Michael Haslgrübler

manifests/config/mastercf.pp

@@ -3,12 +3,25 @@
 # define to build up master.cf
 #
 # === Parameters
+#  ensure       = (Default: present)
+#  type         = (Default: 'unix')
+#  private      = (Default: '-')
+#  unprivileged = (Default: '-')
+#  chroot       = (Default: '-')
+#  wakeup       = (Default: '-')
+#  limit        = (Default: '-')
+#  command      = (Default: 'echo',
+#  options      = a hash of option, value pairs, creating '-o <option>=<value>'
+#                 statements after the command. Any options in this hash will
+#                 be placed after any options written directly with the command.
+#                 (Default is empty)
 #
 # === Variables
 #
 # === Authors
 #
 # mjhas@github
+#
 define postfix::config::mastercf (
   $ensure       = present,
   $type         = 'unix',
@@ -17,13 +30,24 @@
   $chroot       = '-',
   $wakeup       = '-',
   $limit        = '-',
-  $command      = 'echo',) {
+  $command      = 'echo',
+  $options      = undef,) {
   Augeas {
     context => '/files/etc/postfix/master.cf',
     notify  => Service['postfix'],
     require => Exec['postfix'],
   }
 
+  if is_hash($options) {
+    $option_line = join (prefix (join_keys_to_values($options, '='), '-o '), ' ')
+  } elsif is_string($options) {
+    warning("parameter options should be a hash of options and values")
+    $option_line = $options
+  } else {
+    fail("invalid format for parameter 'options', should be hash, but may be string")
+  }
+  $full_command =  rstrip("${command} ${option_line}")
+
   case $ensure {
     present : {
       augeas { "postfix master.cf ${name}":
@@ -34,7 +58,7 @@
           "set ${name}/chroot ${chroot}",
           "set ${name}/wakeup ${wakeup}",
           "set ${name}/limit ${limit}",
-          "set ${name}/command '${command}'",
+          "set ${name}/command '${full_command}'",
           ],
       }
     }

spec/defines/mastercf_spec.rb

@@ -41,17 +41,17 @@
   let(:facts) { {:operatingsystem => 'Debian', :operatingsystemrelease => '7.1'} }
   let(:title) { 'qmgr' }
   let(:params) { {
-	:ensure => 'present',
-	:type => 'unix',
-	:private => '-',
-	:unprivileged => 'n',
-	:chroot => 'n',
-	:wakeup => '-',
-	:limit => '-',
-	:command => 'virtual',
+    :ensure => 'present',
+    :type => 'unix',
+    :private => '-',
+    :unprivileged => 'n',
+    :chroot => 'n',
+    :wakeup => '-',
+    :limit => '-',
+    :command => 'virtual',
   } }
   it 'should have an augeas resource' do
-	should contain_augeas('postfix master.cf qmgr')
+    should contain_augeas('postfix master.cf qmgr')
   end
   describe_augeas 'postfix master.cf qmgr', :lens => 'postfix_master', :target => 'etc/postfix/master.cf' do
     it 'qmgr should stay the same' do
@@ -70,3 +70,33 @@
   end
 end
 
+describe 'postfix::config::mastercf', :type => :define do
+  let(:facts) { {:operatingsystem => 'Debian', :operatingsystemrelease => '7.1'} }
+  let(:title) { 'foobar' }
+  let(:params) { {
+    :ensure => 'present',
+    :type => 'unix',
+    :private => '-',
+    :unprivileged => 'n',
+    :chroot => 'n',
+    :wakeup => '-',
+    :limit => '-',
+    :command => 'a_command',
+    :options => { 'key1' => 'value1', 'key2' => 'value2', },
+  } }
+  it 'should have an augeas resource' do
+    should contain_augeas('postfix master.cf foobar')
+  end
+  describe_augeas 'postfix master.cf foobar', :lens => 'postfix_master', :target => 'etc/postfix/master.cf' do
+    it 'foobar should have proper command line' do
+      should execute
+
+      aug_get('foobar/command').should 
+          be_in('a_command -o key1=value1 -o key2=value2',
+                'a_command -o key2=value2 -o key1=value1') 
+
+      should execute.idempotently
+    end
+  end
+end
+