d-ports: set apache memlimit

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a80493ff3bcd2a43374b59793e0bd66f4fc2dfc0..3e66dc9d8b4b4b6507a675f77398e8088ca50653 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -15,6 +15,8 @@ roles:
     - beach.debian.org
   buildd_master:
     - wuiet.debian.org
+  buildd_ports_master:
+    - portman.debian.org
   contributors:
     - nono.debian.org
   dbmaster:

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 0470b644b5fe0751c9b5ef8d7442a9e77c70c475..b1f20a23920249a3371c224ba6b7ea14e0e7d646 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -43,6 +43,8 @@ class apache2 {
 
        if has_role('buildd_master') {
                $memlimit = 192 * 1024 * 1024
+       } elsif has_role('buildd_ports_master') {
+               $memlimit = 192 * 1024 * 1024
        } elsif has_role('nagiosmaster') {
                $memlimit = 96 * 1024 * 1024
        } elsif has_role('packagesqamaster') {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 6350031f16a40d0069385b77e464a3d5fd64e444..8953f4963d3ec9e70475c1c80d9ec6362df04bce 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -298,3 +298,5 @@ host_settings:
     - storace.debian.org
   buildd_master:
     - wuiet.debian.org
+  buildd_ports_master:
+    - portman.debian.org

diff --git a/modules/roles/manifests/buildd_ports_master.pp b/modules/roles/manifests/buildd_ports_master.pp
new file mode 100644 (file)
index 0000000..b48004f
--- /dev/null
+++ b/modules/roles/manifests/buildd_ports_master.pp
@@ -0,0 +1,5 @@
+class roles::buildd_master {
+       ssl::service { 'buildd.debian-ports.org':
+               notify => Service['apache2'],
+       }
+}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3d69c3fa7760f8aac9105158479cba33bbeacc05..eed52fe8ab04117422c718d5c7ad8355ffdde5ba 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -168,6 +168,10 @@ class roles {
                include roles::buildd_master
        }
 
+       if has_role('buildd_ports_master') {
+               include roles::buildd_ports_master
+       }
+
        if has_role('piuparts') {
                include roles::piuparts
        }