Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / modules / debian-org / misc / local.yaml

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7b8b815..58e69b7 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -59,6 +59,7 @@ nameinfo:
   schroeder.debian.org: Hermann Schroeder (1904 - 1984)
   schumann.debian.org: Robert Alexander Schumann (8 June 1810 - 29 July 1856)
   senfl.debian.org: Ludwig Senfl (~1490 - ~1543)
+  sibelius.debian.org: Jean Sibelius (December 8, 1865 - September 20, 1957)
   smetana.debian.org: Bedřich Smetana (2 March 1824 - 12 May 1884)
   soler.debian.org: Padre Antonio Soler (December 3, 1729 (baptized) - December 20, 1783)
   sperger.debian.org: Johannes Matthias Sperger (March 23, 1750 - May 13, 1812)
@@ -106,35 +107,6 @@ host_settings:
     - ries.debian.org
     - rietz.debian.org
     - spohr.debian.org
-  apache2_defaultconfig:
-    - bellini.debian.org
-    - carver.debian.org
-    - cimarosa.debian.org
-    - draghi.debian.org
-    - duarte.debian.org
-    - gluck.debian.org
-    - kaufmann.debian.org
-    - klecker.debian.org
-    - liszt.debian.org
-    - lobos.debian.org
-    - piatti.debian.org
-    - raff.debian.org
-    - ravel.debian.org
-    - respighi.debian.org
-    - ries.debian.org
-    - rore.debian.org
-    - saens.debian.org
-    - samosa.debian.org
-    - schein.debian.org
-    - senfl.debian.org
-    - soler.debian.org
-    - spohr.debian.org
-    - steffani.debian.org
-    - tartini.debian.org
-    - villa.debian.org
-    - widor.debian.org
-    - wieck.debian.org
-    - wolkenstein.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - kassia.debian.org
@@ -168,8 +140,6 @@ host_settings:
   squeeze:
     - fano.debian.org
     - finzi.debian.org
-  smarthost_port:
-    voltaire.debian.org: 25
   smarthost:
     agnesi.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
@@ -221,6 +191,7 @@ host_settings:
     schroeder.debian.org: mailout.debian.org
     schumann.debian.org: mailout.debian.org
     senfl.debian.org: mailout.debian.org
+    sibelius.debian.org: mailout.debian.org
     smetana.debian.org: mailout.debian.org
     soler.debian.org: mailout.debian.org
     sperger.debian.org: mailout.debian.org