From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 20 Jun 2012 08:56:02 +0000 (+0200)
Subject: Add beach
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=efe9f7a25834c736407891e7a1b0832dba16ba8b

Add beach
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b8fe5e4..931c6d0f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -87,7 +87,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
 		include nfs-server
 	}
 
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index d2e49983..0c15379c 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -77,7 +77,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach] {
 		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 755bbc68..89526bf9 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -12,6 +12,7 @@ nameinfo:
   arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
   barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981)
   barriere.debian.org: Jean-Baptiste Barrière (May 2nd, 1707 - June 6th, 1747)
+  beach.debian.org: Amy Marcy Cheney Beach (September 5, 1867 - December 27, 1944)
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
   bendel.debian.org: Franz Bendel (March 23, 1833 - July 3, 1874)