From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 13:15:58 +0000 (+0200)
Subject: dedup -> hiera role; explicitly include apache2
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a5eb58f27793e53a8336457a57b4355f7bce3484;p=mirror%2Fdsa-puppet.git

dedup -> hiera role; explicitly include apache2
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 902da87ff..546293630 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -243,8 +243,6 @@ roles:
     - tye.debian.org
   l10n.d.o:
     - tye.debian.org
-  dedup.d.n:
-    - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
   ports_master:
diff --git a/hieradata/nodes/delfin.debian.org.yaml b/hieradata/nodes/delfin.debian.org.yaml
new file mode 100644
index 000000000..a642988fd
--- /dev/null
+++ b/hieradata/nodes/delfin.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::dedup
diff --git a/modules/roles/manifests/dedup.pp b/modules/roles/manifests/dedup.pp
new file mode 100644
index 000000000..852910e2c
--- /dev/null
+++ b/modules/roles/manifests/dedup.pp
@@ -0,0 +1,5 @@
+class roles::dedup {
+  include apache2
+
+  ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 948127faa..6afdaa4f6 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -212,10 +212,6 @@ class roles {
 		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('dedup.d.n') {
-		ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('pet.d.n') {
 		ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 		ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }