Merge branch 'master' of https://bitbucket.org/tmakinen/puppet

dhcp/manifests/init.pp

@@ -96,7 +96,8 @@ class dhcp::server inherits dhcp::server::common {
 
 class dhcp::server::ldap inherits dhcp::server::common {
 
-    include ldap::client::python
+    include python
+    include ldap::client
 
     file { "/usr/local/sbin/dhcpdump.py":
         ensure  => present,
@@ -126,8 +127,12 @@ class dhcp::server::ldap inherits dhcp::server::common {
         path    => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
         command => "dhcpdump.py /etc/dhcpd.conf.in* > /etc/dhcpd.conf",
         unless  => "dhcpdump.py /etc/dhcpd.conf.in* | diff /etc/dhcpd.conf -",
-        require => [ File["/etc/dhcpd.conf.in"],
+        require => [
-                     File["/usr/local/sbin/dhcpdump.py"], ],
+          File["/etc/dhcpd.conf.in"],
+          File["/usr/local/sbin/dhcpdump.py"],
+          Class["python"],
+          Class["ldap::client"],
+        ],
         notify  => Service["dhcpd"],
     }
 

ejabberd/manifests/init.pp

@@ -20,6 +20,9 @@
 #   $ejabberd_muclog_datadir:
 #       Path where to store chatroom logs. Disabled by default.
 #
+#   $ejabberd_muclog_format:
+#       Chatroom log format. Valid values html or plaintext, defaults to html.
+#
 class ejabberd {
 
     include user::system
@@ -32,6 +35,14 @@ class ejabberd {
         $ejabberd_admin = []
     }
 
+    case $ejabberd_muclog_format {
+        "": { $ejabberd_muclog_format = "html" }
+        "html","plaintext": { }
+        default: {
+            fail("Invalid value ${ejabberd_muclog_format} for \$ejabberd_muclog_format.")
+        }
+    }
+
     package { "ejabberd":
         ensure  => installed,
         require => [ User["ejabberd"], User["ejabberd"] ],

ejabberd/templates/ejabberd.cfg.erb

@@ -583,6 +583,7 @@ user, host = admin.split("@") -%>
 		  {access_log, muc},
 		  {outdir, "<%= ejabberd_muclog_datadir %>"},
 		  {dirtype, subdirs},
+		  {file_format, <%= ejabberd_muclog_format %>},
 		  {cssfile, false},
 		  {top_link, {"/portal/", "Back to Portal"}}
 		 ]},

emacs/manifests/init.pp

@@ -9,7 +9,7 @@ class emacs {
 
     if $puppetversion =~ /^2\./ {
         Package["emacs"] {
-            flavor => "gtk",
+            flavor => "no_x11",
         }
     }
 

python/manifests/init.pp

@@ -1,3 +1,27 @@
+
+# Install python
+#
+class python {
+
+    package { "python":
+         ensure => installed,
+         notify => $operatingsystem ? {
+             "openbsd" => Exec["python-links"],
+             default   => undef,
+         },
+    }
+
+    exec { "python-links":
+        path        => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
+        command     => "pkg_info python | egrep '^[ ]*ln -sf' | sh",
+        user        => "root",
+        group       => "wheel",
+        refreshonly => true,
+    }
+
+}
+
+
 # Install python software using setup.py.
 #
 # === Parameters