From 72aa72dcf9fa060434f1d22bba34258fb4c49f3a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 15:42:59 +0200 Subject: [PATCH] Make a proper role for cgi.debian.org on wolkenstein --- hieradata/common.yaml | 2 -- hieradata/nodes/wolkenstein.debian.org.yaml | 1 + modules/roles/manifests/init.pp | 4 ---- modules/roles/manifests/www_cgi.pp | 4 ++++ 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 modules/roles/manifests/www_cgi.pp diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 4746258f1..7796a1bbe 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -157,8 +157,6 @@ roles: - wilder.debian.org www_master: - wolkenstein.debian.org - cgi.d.o: - - wolkenstein.debian.org postgres_backup_server: - backuphost.debian.org - storace.debian.org diff --git a/hieradata/nodes/wolkenstein.debian.org.yaml b/hieradata/nodes/wolkenstein.debian.org.yaml index 2061247e6..1ecdf5053 100644 --- a/hieradata/nodes/wolkenstein.debian.org.yaml +++ b/hieradata/nodes/wolkenstein.debian.org.yaml @@ -3,3 +3,4 @@ classes: - roles::search_backend - roles::static_source - roles::weblog_destination + - roles::www_cgi diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 765e1e0f3..d298086e4 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -66,10 +66,6 @@ class roles { include roles::www_master } - if has_role('cgi.d.o') { - ssl::service { 'cgi.debian.org': notify => Exec['service apache2 reload'], key => true, } - } - if has_role('wiki') { include roles::wiki } diff --git a/modules/roles/manifests/www_cgi.pp b/modules/roles/manifests/www_cgi.pp new file mode 100644 index 000000000..b239275f0 --- /dev/null +++ b/modules/roles/manifests/www_cgi.pp @@ -0,0 +1,4 @@ +class roles::www_cgi { + include apache2 + ssl::service { 'cgi.debian.org': notify => Exec['service apache2 reload'], key => true, } +} -- 2.20.1