projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove auto-cert and auto-clientcert symlinks from fileserver path
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
a224a1d
..
8ccca49
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-84,6
+84,9
@@
class roles {
if has_role('ssh.upload.d.o') {
include roles::ssh_upload
}
if has_role('ssh.upload.d.o') {
include roles::ssh_upload
}
+ if has_role('security_upload') {
+ include roles::security_upload
+ }
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
notify => Exec['service apache2 reload'],
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
notify => Exec['service apache2 reload'],
@@
-222,17
+225,6
@@
class roles {
include roles::jenkins
}
include roles::jenkins
}
- if has_role('keystone') {
- include roles::keystone
- }
- if has_role('keystone_rabbitmq') {
- include roles::keystone::rabbitmq
- }
-
- if has_role('memcached') {
- include roles::memcached
- }
-
if has_role('postgres_backup_server') {
include postgres::backup_server
}
if has_role('postgres_backup_server') {
include postgres::backup_server
}
@@
-255,6
+247,13
@@
class roles {
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org': notify => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org': notify => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
+ file { '/etc/ssl/debian-local/other-keys/gobby.debian.org.key':
+ ensure => present,
+ mode => '0440',
+ group => 'gobby',
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/gobby.debian.org.key") %>'),
+ links => follow,
+ }
}
if has_role('search_backend') {
}
if has_role('search_backend') {
@@
-325,7
+324,7
@@
class roles {
}
if has_role('postgresql_server') {
}
if has_role('postgresql_server') {
- include
roles::postgresql_server
+ include
postgres::backup_source
}
if has_role('bacula_director') {
}
if has_role('bacula_director') {
@@
-337,4
+336,12
@@
class roles {
if has_role('bacula_storage') {
include bacula::storage
}
if has_role('bacula_storage') {
include bacula::storage
}
+
+ if has_role('salsa.debian.org') {
+ include salsa
+ }
+
+ if $::keyring_debian_org_mirror {
+ include roles::keyring_debian_org_mirror
+ }
}
}