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

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f54f24cea..c4ccc91ba 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -112,8 +112,6 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  udd:
-    - ullmann.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
diff --git a/hieradata/nodes/ullmann.debian.org.yaml b/hieradata/nodes/ullmann.debian.org.yaml
new file mode 100644
index 000000000..ed63f4047
--- /dev/null
+++ b/hieradata/nodes/ullmann.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::udd
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f1ab41dde..20a963f3a 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -63,9 +63,7 @@ class apache2(
     ensure => absent,
   }
 
-  if has_role('udd') {
-    $memlimit = 512 * 1024 * 1024
-  } elsif has_role('popcon') {
+  if has_role('popcon') {
     $memlimit = 512 * 1024 * 1024
   } else {
     $memlimit = $rlimitmem
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e26986d48..fefab3fe4 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -65,10 +65,6 @@ class roles {
 		include roles::rtmaster
 	}
 
-	if has_role('udd') {
-		include roles::udd
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
diff --git a/modules/roles/manifests/udd.pp b/modules/roles/manifests/udd.pp
index 9a92c8214..c4f814f85 100644
--- a/modules/roles/manifests/udd.pp
+++ b/modules/roles/manifests/udd.pp
@@ -1,6 +1,10 @@
 class roles::udd {
-	ssl::service { 'udd.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  class { 'apache2':
+    rlimitmem => 512 * 1024 * 1024,
+  }
+
+  ssl::service { 'udd.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }