projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace change
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
dbmaster.pp
diff --git
a/modules/roles/manifests/dbmaster.pp
b/modules/roles/manifests/dbmaster.pp
index
1bd9d2b
..
1a0fa9e
100644
(file)
--- a/
modules/roles/manifests/dbmaster.pp
+++ b/
modules/roles/manifests/dbmaster.pp
@@
-7,24
+7,25
@@
# include roles::dbmaster
#
class roles::dbmaster {
# include roles::dbmaster
#
class roles::dbmaster {
+ include apache2
include roles::pubsub::parameters
$rabbit_password = $roles::pubsub::parameters::rabbit_password
ssl::service { 'db.debian.org':
include roles::pubsub::parameters
$rabbit_password = $roles::pubsub::parameters::rabbit_password
ssl::service { 'db.debian.org':
- notify => [ Exec['service apache2 reload'],
- Service['slapd'] ],
- key => true,
+ notify
=> [ Exec['service apache2 reload'],
+
Service['slapd'] ],
+ key
=> true,
tlsaport => [443, 389, 636],
}
tlsaport => [443, 389, 636],
}
- file {
"/etc/ldap/db.debian.org.key"
:
- ensure => present,
- mode => '0440',
- group => 'openldap',
+ file {
'/etc/ldap/db.debian.org.key'
:
+ ensure
=> present,
+ mode
=> '0440',
+ group
=> 'openldap',
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/db.debian.org.key") %>'),
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/db.debian.org.key") %>'),
- links => follow,
+ links
=> follow,
}
roles::pubsub::config { 'generate':
}
roles::pubsub::config { 'generate':
@@
-47,4
+48,9
@@
class roles::dbmaster {
key => $facts['dsa_key'],
collect_tag => 'puppetmaster',
}
key => $facts['dsa_key'],
collect_tag => 'puppetmaster',
}
+
+ exim::vdomain { 'db.debian.org':
+ mail_user => 'mail_db',
+ mail_group => 'nogroup',
+ }
}
}