udd -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f54f24c..c4ccc91 100644 (file)
--- 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 (file)
index 0000000..ed63f40
--- /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 f1ab41d..20a963f 100644 (file)
--- 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 e26986d..fefab3f 100644 (file)
--- 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 9a92c82..c4f814f 100644 (file)
--- 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,
+  }
 }