popcon -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9cecbc9..57b47b6 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -58,8 +58,6 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  popcon:
-    - pinel.debian.org
   rtmaster:
     - reger.debian.org
   security_master:

diff --git a/hieradata/nodes/pinel.debian.org.yaml b/hieradata/nodes/pinel.debian.org.yaml
index 212974c..d8342f7 100644 (file)
--- a/hieradata/nodes/pinel.debian.org.yaml
+++ b/hieradata/nodes/pinel.debian.org.yaml
@@ -1,2 +1,4 @@
 ---
 apache2::smaller_number_of_threads: true
+classes:
+  - roles::popcon

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 20a963f..64bf7ff 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -63,12 +63,6 @@ class apache2(
     ensure => absent,
   }
 
-  if has_role('popcon') {
-    $memlimit = 512 * 1024 * 1024
-  } else {
-    $memlimit = $rlimitmem
-  }
-
   apache2::config { 'resource-limits':
     content => template('apache2/resource-limits.erb'),
   }

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index 5673c0d..4841488 100644 (file)
--- a/modules/apache2/templates/resource-limits.erb
+++ b/modules/apache2/templates/resource-limits.erb
@@ -4,5 +4,5 @@
 ##
 
 RLimitCPU 180
-RLimitMEM <%= @memlimit %>
+RLimitMEM <%= @rlimitmem %>
 RLimitNPROC <%= @rlimitnproc %>

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 583ad92..98fb71e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -96,8 +96,4 @@ class roles {
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }
-
-       if has_role('popcon') {
-               include roles::popcon
-       }
 }

diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp
index 080c8d5..1a2866c 100644 (file)
--- a/modules/roles/manifests/popcon.pp
+++ b/modules/roles/manifests/popcon.pp
@@ -1,12 +1,16 @@
 class roles::popcon {
-       ssl::service { 'popcon.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  class { 'apache2':
+    rlimitmem => 512 * 1024 * 1024,
+  }
 
-       include apache2::ssl
-       apache2::site { 'popcon.debian.org':
-               site => 'popcon.debian.org',
-               source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
-       }
+  include apache2::ssl
+
+  ssl::service { 'popcon.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { 'popcon.debian.org':
+    site   => 'popcon.debian.org',
+    source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
+  }
 }