From: Stephen Gran <steve@lobefin.net>
Date: Sat, 20 Apr 2013 09:30:34 +0000 (+0100)
Subject: pick up some other useful rules
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=631d4f573838dc34677c4e7657d3851d2d32ddb8;p=mirror%2Fdsa-puppet.git

pick up some other useful rules

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3533856f0..492823da2 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -81,7 +81,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,holter,lindberg,master,beach,buxtehude] {
+	if $::hostname in [busoni,holter,lindberg,master,beach,buxtehude,picconi] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a120f9128..dcfbfe2a5 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -207,6 +207,7 @@ host_settings:
     - morricone.debian.org
     - muffat.debian.org
     - nono.debian.org
+    - picconi.debian.org
     - popov.debian.org
     - quantz.debian.org
     - ravel.debian.org