From 6781daeb2191f6f179e15f8e49ffc34274387c8a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 15:00:31 +0200 Subject: [PATCH] api.ftp-master -> hiera role; explicitly include apache2 --- hieradata/common.yaml | 2 -- hieradata/nodes/coccia.debian.org.yaml | 2 ++ modules/roles/manifests/api_ftp_master.pp | 7 +++++++ modules/roles/manifests/init.pp | 6 ------ 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 modules/roles/manifests/api_ftp_master.pp diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 127795dff..97997eaf0 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -54,8 +54,6 @@ roles: ftp.upload.d.o: - coccia.debian.org - usper.debian.org - api.ftp-master: - - coccia.debian.org dgit_browse: - cgi-grnet-01.debian.org dgit_git: diff --git a/hieradata/nodes/coccia.debian.org.yaml b/hieradata/nodes/coccia.debian.org.yaml index 3ccff770b..fcfe9c360 100644 --- a/hieradata/nodes/coccia.debian.org.yaml +++ b/hieradata/nodes/coccia.debian.org.yaml @@ -1,2 +1,4 @@ +--- classes: + - roles::api_ftp_master - roles::static_source diff --git a/modules/roles/manifests/api_ftp_master.pp b/modules/roles/manifests/api_ftp_master.pp new file mode 100644 index 000000000..b60246958 --- /dev/null +++ b/modules/roles/manifests/api_ftp_master.pp @@ -0,0 +1,7 @@ +class roles::api_ftp_master { + include apache2 + ssl::service { 'api.ftp-master.debian.org': + notify => Exec['service apache2 reload'], + key => true, + } +} diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 09bf30827..c8842fa02 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -47,12 +47,6 @@ class roles { 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'], - key => true, - } - } # # security.debian.org if has_role('security_master') { -- 2.20.1