fixing up loose ends with exim4 configuration

local-modules/exim4-config/manifests/dkim.pp

@@ -3,14 +3,15 @@
 #
 
 # 'name' must match the domain key selector and the portion of the key file
-define exim4_config::dkim {
-  include exim4_config::functions;
+define exim4-config::dkim {
+  include exim4-config::functions
 
   file { "/etc/exim4/conf.d/main/000-dkim":
     owner   => root,
     group   => root,
     mode    => '0644',
     content => template("exim4-config/dkim.erb"),
+    require => Package['exim4'],
     notify  => Exec['reload-exim4']
   }
 }

local-modules/exim4-config/manifests/functions.pp

@@ -1,8 +1,9 @@
-class exim4_config::functions {
+class exim4-config::functions {
+  include exim4-config
   exec {
     "reload-exim4" :
       refreshonly => true,
-      command => "update-exim4.conf; /etc/init.d/exim4 reload",
+      command => "/bin/sh -c 'update-exim4.conf && /etc/init.d/exim4 reload'",
       require => Package["exim4"];
   }
 }

local-modules/exim4-config/manifests/init.pp

@@ -0,0 +1,6 @@
+class exim4-config {
+  package {
+  "exim4" :
+    ensure  => installed;
+  }
+}

local-modules/exim4-config/manifests/selfrouting.pp

@@ -3,8 +3,8 @@
 #
 #
 
-class exim4_config::selfrouting {
-  include exim4_config::functions;
+class exim4-config::selfrouting {
+  include exim4-config::functions
 
   file { "/etc/exim4/update-exim4.conf.conf":
     owner   => root,

manifests/vagrant.pp

@@ -9,6 +9,13 @@ node /^lucid32$/ {
     # - add 'wiki2.jenkins-ci.org' to /etc/hosts as 127.0.0.1
     # include confluence
 
+    include exim4-config::selfrouting
+
+    exim4-config::dkim {
+      'cucumber':
+        ;
+    }
+
     firewall {
       '100 accept inbound HTTP requests' :
         proto  => 'tcp',