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

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

Browse source
This commit is contained in:
Ossi Salmi 2013-08-12 16:23:18 +03:00
commit d4873ad791
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kerberos/manifests/init.pp
View file

@ -124,24 +124,39 @@ class kerberos::server {
if $kerberos_datadir {
file { $kerberos_datadir:
ensure => directory,
mode => "0600",
owner => "root",
group => "root",
ensure => directory,
mode => "0600",
owner => "root",
group => "root",
seltype => "krb5_conf_t",
}
file { "/srv/kerberos":
ensure => link,
target => $kerberos_datadir,
owner => "root",
group => "root",
seltype => "usr_t",
require => File[$kerberos_datadir],
}
selinux::manage_fcontext { "${kerberos_datadir}(/.*)?":
type => "krb5_conf_t",
before => File[$kerberos_datadir],
}
selinux::manage_fcontext { "/srv/kerberos":
type => "usr_t",
before => File["/srv/kerberos"],
}
} else {
file { "/srv/kerberos":
ensure => directory,
mode => "0600",
owner => "root",
group => "root",
ensure => directory,
mode => "0600",
owner => "root",
group => "root",
seltype => "krb5_conf_t",
}
selinux::manage_fcontext { "/srv/kerberos(/.*)?":
type => "krb5_conf_t",
before => File["/srv/kerberos"],
}
}

2
mirror/manifests/init.pp
View file

@ -11,6 +11,8 @@ class mirror($datadir = "/srv/mirrors") {
include user::system
realize(User["mirror"], Group["mirror"])
require rsync
if $datadir != "/srv/mirrors" {
file { "/srv/mirrors":
ensure => link,