Merge commit 'c371b493' into staging

manifests/classes/postfix.pp

@@ -65,6 +65,7 @@ class postfix {
     ensure => installed,
     name   => $lsbdistcodename ? {
       "squeeze" => "bsd-mailx",
+      "lucid"   => "bsd-mailx",
       default   => "mailx",
     },
   }

manifests/definitions/config.pp

@@ -37,13 +37,13 @@ define postfix::config ($ensure = present, $value) {
 
   case $ensure {
     present: {
-      augeas { "set postfix $name to $value":
+      augeas { "set postfix '${name}' to '${value}'":
         changes => "set $name $value",
       }
     }
 
     absent: {
-      augeas { "set postfix $name to $value":
+      augeas { "rm postfix '${name}'":
         changes => "rm $name",
       }
     }