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

ldap/manifests/init.pp

@@ -464,7 +464,7 @@ class ldap::server {
             if $::operatinsystemrelease !~ /^5\./ {
                 file { "/etc/sysconfig/ldap":
                     ensure  => present,
-                    source  => "puppet:///modules/ldap/ldap.sysconfig",
+                    content => template("ldap/ldap.sysconfig.erb"),
                     mode    => "0644",
                     owner   => "root",
                     group   => "root",
@@ -530,16 +530,14 @@ class ldap::server {
         }
     }
 
-    if $::selinux == "true" {
-        selinux::manage_fcontext { "/srv/ldap(/.*)?":
+    selinux::manage_fcontext { "/srv/ldap(/.*)?":
+        type   => "slapd_db_t",
+        before => File["/srv/ldap"],
+    }
+    if $ldap_datadir {
+        selinux::manage_fcontext { "${ldap_datadir}(/.*)?":
             type   => "slapd_db_t",
-            before => File["/srv/ldap"],
-        }
-        if $ldap_datadir {
-            selinux::manage_fcontext { "${ldap_datadir}(/.*)?":
-                type   => "slapd_db_t",
-                before => File[$ldap_datadir],
-            }
+            before => File[$ldap_datadir],
         }
     }
 

ldap/templates/ldap.sysconfig.erb

@@ -1,5 +1,5 @@
 # Options of slapd (see man slapd)
-SLAPD_OPTIONS="-f /etc/openldap/slapd.conf"
+SLAPD_OPTIONS="-f /etc/openldap/slapd.conf<% if @ipv6enabled == 'false' %> -4<% end %>"
 
 # At least one of SLAPD_LDAP, SLAPD_LDAPI and SLAPD_LDAPS must be set to 'yes'!
 #

ntpd/templates/ntp.conf.erb

@@ -16,7 +16,9 @@ restrict -6 default nomodify notrap nopeer noquery
 
 # Local users may interrogate the ntp server more closely.
 restrict 127.0.0.1 nomodify
+<% if @ipv6enabled == "true" -%>
 restrict ::1 nomodify
+<% end -%>
 
 # Drift file.
 driftfile /var/lib/ntp/ntp.drift