Merge tmakinen/puppet

git/manifests/init.pp

@@ -33,10 +33,11 @@ class git::server {
 
     if $git_datadir {
         file { $git_datadir:
-            ensure => directory,
-            mode   => "0755",
-            owner  => "root",
-            group  => "root",
+            ensure  => directory,
+            mode    => "0755",
+            owner   => "root",
+            seltype => "git_system_content_t",
+            group   => "root",
         }
         file { "/srv/git":
             ensure  => link,
@@ -49,20 +50,13 @@ class git::server {
             mode    => "0755",
             owner   => "root",
             group   => "root",
-            seltype => "httpd_sys_content_t",
         }
     }
 
-    if "${selinux}" == "true" {
-        selinux::manage_fcontext { "/srv/git(/.*)?":
-            type   => "httpd_sys_content_t",
-            before => File["/srv/git"],
-        }
-        if $git_datadir {
-            selinux::manage_fcontext { "${git_datadir}(/.*)?":
-                type   => "httpd_sys_content_t",
-                before => File[$git_datadir],
-            }
+    if $git_datadir {
+        selinux::manage_fcontext { "${git_datadir}(/.*)?":
+            type   => "git_system_content_t",
+            before => File[$git_datadir],
         }
     }
 

ldap/manifests/init.pp

@@ -611,6 +611,9 @@ class ldap::server {
 #       Password for uid=replicator,cn=config,${name} user on master.
 #       Only needed for slave databases.
 #
+#   $rid:
+#       Replica ID. Must be unique per replica per database.
+#
 #   $moduleoptions:
 #       Options for overlay modules.
 #
@@ -620,10 +623,16 @@ class ldap::server {
 #     moduleoptions => [ "smbkrb5pwd-enable=samba", ]
 # }
 #
-define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $moduleoptions = []) {
+define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $rid = "", $moduleoptions = []) {
 
     include ldap::server
 
+    if $rid == "" {
+        $rid_real = fqdn_rand(999)
+    } else {
+        $rid_real = $rid
+    }
+
     file { "${ldap::server::config}/slapd.conf.d/db.${name}.conf":
         ensure  => present,
         content => template("ldap/slapd-database.conf.erb"),

ldap/templates/slapd-database.conf.erb

@@ -29,18 +29,18 @@ overlay				syncprov
 syncprov-checkpoint		100 10
 syncprov-sessionlog		100
 
-# The database directory MUST exist prior to running slapd AND 
+# The database directory MUST exist prior to running slapd AND
 # should only be accessible by the slapd and slap tools.
 # Mode 700 recommended.
 directory	/srv/ldap/<%= name %>
 
 <% if master != "" -%>
 # replication
-syncrepl rid=2
+syncrepl rid=<%= rid_real %>
          provider=<%= master %>
          type=refreshAndPersist
          retry="10 10 60 +"
-         searchbase="<%= ldap_basedn %>"
+         searchbase="<%= name %>"
          filter="(objectClass=*)"
          scope="sub"
          sizelimit=500000
@@ -48,7 +48,7 @@ syncrepl rid=2
          schemachecking="off"
          bindmethod="simple"
          tls_reqcert="never"
-         binddn="uid=replicator,cn=config,<%= ldap_basedn %>"
+         binddn="uid=replicator,cn=config,<%= name %>"
          credentials="<%= syncpw %>"
 updateref <%= master %>
 <% end -%>

wiki/Makefile

@@ -4,7 +4,7 @@ GWIKIBRANCH = default
 GWIKISOURCE = https://bitbucket.org/clarifiednetworks/graphingwiki/get/$(GWIKIBRANCH).tar.gz
 GWIKITARGET = graphingwiki-$(GWIKIBRANCH)-$(TIMESTAMP).tar.gz
 
-MOINVERSION = 1.9.4
+MOINVERSION = 1.9.6
 MOINSOURCE = http://static.moinmo.in/files/moin-$(MOINVERSION).tar.gz
 MOINTARGET = moin-$(MOINVERSION).tar.gz