From 60abc62b4de8b4d30645ca23a8201914ddf1e72e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 18:28:08 +0200 Subject: [PATCH] wiki -> hiera role; explicitly include apache2 --- hieradata/common.yaml | 2 -- hieradata/nodes/wilder.debian.org.yaml | 3 +++ modules/roles/manifests/init.pp | 4 ---- modules/roles/manifests/wiki.pp | 15 ++++++++------- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 hieradata/nodes/wilder.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 4a637e13f..1e02cf0f3 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -131,8 +131,6 @@ roles: - smit.debian.org udd: - ullmann.debian.org - wiki: - - wilder.debian.org postgres_backup_server: - backuphost.debian.org - storace.debian.org diff --git a/hieradata/nodes/wilder.debian.org.yaml b/hieradata/nodes/wilder.debian.org.yaml new file mode 100644 index 000000000..06b47c54e --- /dev/null +++ b/hieradata/nodes/wilder.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::wiki diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 2afec7f93..0abfd9baa 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -45,10 +45,6 @@ class roles { include roles::security_mirror } - if has_role('wiki') { - include roles::wiki - } - if has_role('syncproxy') { include roles::syncproxy } diff --git a/modules/roles/manifests/wiki.pp b/modules/roles/manifests/wiki.pp index b6fb7e866..0299aef1c 100644 --- a/modules/roles/manifests/wiki.pp +++ b/modules/roles/manifests/wiki.pp @@ -1,9 +1,10 @@ class roles::wiki { - ssl::service { 'wiki.debian.org': - notify => Exec['service apache2 reload'], - key => true, - } - rsync::site { 'wiki': - source => 'puppet:///modules/roles/wiki/rsyncd.conf', - } + include apache2 + ssl::service { 'wiki.debian.org': + notify => Exec['service apache2 reload'], + key => true, + } + rsync::site { 'wiki': + source => 'puppet:///modules/roles/wiki/rsyncd.conf', + } } -- 2.20.1