From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 15 Jun 2013 23:07:37 +0000 (+0200)
Subject: Drop piatti
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=d5728bdb4fd44fc50442347a977568a2d93287ea

Drop piatti
---

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 167c4fe6..2a5beb0f 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -23,18 +23,6 @@ case fqdn
   when "spohr.debian.org" then
     out += "
         Alias /debian \"/srv/mirrors/ftp.debian.org/ftp\"
-"
-  when "piatti.debian.org" then
-    out += "
-       # for piuparts, RT#1218
-       Alias /debian/ \"/org/mirrors/ftp.debian.org/ftp/\"
-       <Directory \"/org/mirrors/ftp.debian.org/ftp/\">
-               Options Indexes MultiViews FollowSymLinks
-               AllowOverride None
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.0/255.0.0.0 ::1/128 193.167.161.225/32
-       </Directory>
 "
 end
 out
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 77d506cb..f7b02acd 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -93,7 +93,6 @@ nameinfo:
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
   pejacevic: Dora Pejačević (September 10, 1885 - March 5, 1923)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
-  piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
   piston.debian.org: Walter Hamor Piston Jr. (January 20th, 1894 – November 12th, 1976)
   popov.debian.org: Gavriil Nikolayevich Popov (Гаврии́л Никола́евич Попо́в) (September 12th, 1904 - February 17th, 1972)
@@ -325,7 +324,6 @@ host_settings:
     - partch.debian.org
     - pasquini.debian.org
     - pettersson.debian.org
-    - piatti.debian.org
     - piston.debian.org
     - pkgmirror-1and1.debian.org
     - porpora.debian.org
@@ -394,7 +392,6 @@ host_settings:
   mail_port:
     ancina.debian.org: 2025
     klecker.debian.org: 2025
-    piatti.debian.org: 2025
     zappa.debian.org: 587
   no_munin:
     - allegri.debian.org
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index a50e8bd8..72bf4f34 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -12,7 +12,7 @@ class ferm::per-host {
 	}
 
 	case $::hostname {
-		piatti,samosa: {
+		samosa: {
 			@ferm::rule { 'dsa-udd-stunnel':
 				description  => 'port 8080 for udd stunnel',
 				rule         => '&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))'
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index f6da85a7..2a41039b 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -33,7 +33,7 @@ Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
 Host_Alias	MEGACTLHOSTS	= nielsen
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	PORTERBOXES	= abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
-Host_Alias	PIUPARTS_SLAVE_HOSTS	= piatti, piu-slave-bm-a
+Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a
 
 # Cmnd alias specification