tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tmakinen/puppet

Browse source
This commit is contained in:
Ossi Salmi 2013-02-09 01:31:46 +02:00
commit d1bfd32123
4 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
git/manifests/init.pp
View file

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

11
ldap/manifests/init.pp
View file

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

6
ldap/templates/slapd-database.conf.erb
View file

@ -36,11 +36,11 @@ directory /srv/ldap/<%= name %>
<% if master != "" -%> <% if master != "" -%>
# replication # replication
syncrepl rid=2 syncrepl rid=<%= rid_real %>
provider=<%= master %> provider=<%= master %>
type=refreshAndPersist type=refreshAndPersist
retry="10 10 60 +" retry="10 10 60 +"
searchbase="<%= ldap_basedn %>" searchbase="<%= name %>"
filter="(objectClass=*)" filter="(objectClass=*)"
scope="sub" scope="sub"
sizelimit=500000 sizelimit=500000
@ -48,7 +48,7 @@ syncrepl rid=2
schemachecking="off" schemachecking="off"
bindmethod="simple" bindmethod="simple"
tls_reqcert="never" tls_reqcert="never"
binddn="uid=replicator,cn=config,<%= ldap_basedn %>" binddn="uid=replicator,cn=config,<%= name %>"
credentials="<%= syncpw %>" credentials="<%= syncpw %>"
updateref <%= master %> updateref <%= master %>
<% end -%> <% end -%>

2
wiki/Makefile
View file

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