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-06 12:57:11 +02:00
commit fee22f529c
3 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apache/manifests/init.pp
View file

@ -81,9 +81,16 @@ class apache::common {
group => "root", group => "root",
seltype => "httpd_rotatelogs_exec_t", seltype => "httpd_rotatelogs_exec_t",
} }
selinux::manage_fcontext { "/usr/local/sbin/www-logrotate.sh": if $::operatingsystem == "Fedora" and $::operatingsystemrelease > 17 {
type => "httpd_rotatelogs_exec_t", selinux::manage_fcontext { "/usr/sbin/www-logrotate.sh":
before => File["/usr/local/sbin/www-logrotate.sh"], type => "httpd_rotatelogs_exec_t",
before => File["/usr/local/sbin/www-logrotate.sh"],
}
} else {
selinux::manage_fcontext { "/usr/local/sbin/www-logrotate.sh":
type => "httpd_rotatelogs_exec_t",
before => File["/usr/local/sbin/www-logrotate.sh"],
}
} }
cron { "www-logrotate": cron { "www-logrotate":

34
ldap/manifests/init.pp
View file

@ -365,7 +365,7 @@ class ldap::server {
command => "usermod -a -G ssl-cert openldap", command => "usermod -a -G ssl-cert openldap",
unless => "id -n -G openldap | grep '\\bssl-cert\\b'", unless => "id -n -G openldap | grep '\\bssl-cert\\b'",
require => Package["openldap-server"], require => Package["openldap-server"],
before => Service["slapd"], before => Exec["slaptest"],
} }
} }
"fedora": { "fedora": {
@ -424,7 +424,7 @@ class ldap::server {
default => "root", default => "root",
}, },
require => Package["openldap-server"], require => Package["openldap-server"],
notify => Service["slapd"], notify => Exec["slaptest"],
} }
file { "${ssl::private}/slapd.key": file { "${ssl::private}/slapd.key":
ensure => present, ensure => present,
@ -433,7 +433,7 @@ class ldap::server {
owner => "root", owner => "root",
group => $group, group => $group,
require => Package["openldap-server"], require => Package["openldap-server"],
notify => Service["slapd"], notify => Exec["slaptest"],
} }
file { "slapd.conf": file { "slapd.conf":
@ -443,7 +443,7 @@ class ldap::server {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
notify => Service["slapd"], notify => Exec["slaptest"],
require => Package["openldap-server"], require => Package["openldap-server"],
} }
file { "${config}/slapd.conf.d": file { "${config}/slapd.conf.d":
@ -468,7 +468,7 @@ class ldap::server {
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
notify => Service["slapd"], notify => Exec["slaptest"],
require => Package["openldap-server"], require => Package["openldap-server"],
} }
} }
@ -479,12 +479,20 @@ class ldap::server {
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
notify => Service["slapd"], notify => Exec["slaptest"],
require => Package["openldap-server"], require => Package["openldap-server"],
} }
} }
} }
exec { "slaptest":
command => "slaptest",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true,
require => File["${config}/slapd.conf.d"],
notify => Service["slapd"],
}
service { "slapd": service { "slapd":
name => $service_name, name => $service_name,
start => $::operatingsystem ? { start => $::operatingsystem ? {
@ -493,7 +501,7 @@ class ldap::server {
}, },
ensure => running, ensure => running,
enable => true, enable => true,
require => Package ["openldap-server"] require => Package["openldap-server"]
} }
if $ldap_datadir { if $ldap_datadir {
@ -562,7 +570,7 @@ class ldap::server {
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true, refreshonly => true,
require => File["${config}/slapd.conf.d"], require => File["${config}/slapd.conf.d"],
notify => Service["slapd"], notify => Exec["slaptest"],
} }
ldap::server::schema { [ "core", "cosine", "ppolicy", ]: ldap::server::schema { [ "core", "cosine", "ppolicy", ]:
idx => 10, idx => 10,
@ -574,13 +582,13 @@ class ldap::server {
owner => "root", owner => "root",
group => $group, group => $group,
require => Exec["generate-slapd-database-config"], require => Exec["generate-slapd-database-config"],
notify => Service["slapd"], notify => Exec["slaptest"],
} }
exec { "generate-slapd-database-config": exec { "generate-slapd-database-config":
command => "find ${config}/slapd.conf.d/db.*.conf -exec echo 'include {}' \\; > ${config}/slapd.conf.d/database.conf", command => "find ${config}/slapd.conf.d/db.*.conf -exec echo 'include {}' \\; > ${config}/slapd.conf.d/database.conf",
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true, refreshonly => true,
notify => Service["slapd"], notify => Exec["slaptest"],
} }
} }
@ -638,7 +646,7 @@ define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $modu
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $ldap::server::group, group => $ldap::server::group,
notify => Service["slapd"], notify => Exec["slaptest"],
} }
file { "${ldap::server::config}/slapd.conf.d/index.${name}.conf": file { "${ldap::server::config}/slapd.conf.d/index.${name}.conf":
@ -649,7 +657,7 @@ define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $modu
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $ldap::server::group, group => $ldap::server::group,
notify => Service["slapd"], notify => Exec["slaptest"],
} }
file { "/srv/ldap/${name}": file { "/srv/ldap/${name}":
@ -674,7 +682,7 @@ define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $modu
}, },
seltype => "slapd_db_t", seltype => "slapd_db_t",
require => File["/srv/ldap/${name}"], require => File["/srv/ldap/${name}"],
before => Service["slapd"], before => Exec["slaptest"],
} }
} }

4
munin/manifests/init.pp
View file

@ -244,11 +244,11 @@ class munin::server {
mode => "0775", mode => "0775",
owner => "munin", owner => "munin",
group => $apache::sslserver::group, group => $apache::sslserver::group,
seltype => "httpd_munin_rw_content_t", seltype => "httpd_sys_rw_content_t",
require => Package["munin"], require => Package["munin"],
} }
selinux::manage_fcontext { "/var/cache/munin(/.*)?": selinux::manage_fcontext { "/var/cache/munin(/.*)?":
type => "httpd_munin_rw_content_t", type => "httpd_sys_rw_content_t",
before => File["/var/cache/munin"], before => File["/var/cache/munin"],
} }
mount { "/var/cache/munin": mount { "/var/cache/munin":