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

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 66f1bbd0e..4043308ff 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -216,8 +216,6 @@ roles:
     - tye.debian.org
   l10n.d.o:
     - tye.debian.org
-  pet.d.n:
-    - petrova.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:
diff --git a/hieradata/nodes/petrova.debian.org.yaml b/hieradata/nodes/petrova.debian.org.yaml
new file mode 100644
index 000000000..b884b01da
--- /dev/null
+++ b/hieradata/nodes/petrova.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::pet
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 438c5a74f..4c07c5a6c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -173,11 +173,6 @@ class roles {
 		ssl::service { 'l10n.debian.org': 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, }
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
diff --git a/modules/roles/manifests/pet.pp b/modules/roles/manifests/pet.pp
new file mode 100644
index 000000000..c3828089d
--- /dev/null
+++ b/modules/roles/manifests/pet.pp
@@ -0,0 +1,5 @@
+class roles::pet {
+  include apache2
+  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, }
+}