remove rore (RT#3773)

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3c0874e3a243b3abda18173ce0df1ef630e5338f..8c1afa14e76fc93bfbb5221f8b0a5fc32846b42f 100644 (file)
--- 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,rore] {
+       if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
                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 70e702ee34134d9da79a68620c2fe5ef8dfe2748..6b7bf5bc016c577a7f5f7f8f3cdff7ddeeab1c05 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -102,7 +102,6 @@ nameinfo:
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19, 1873 - May 11th, 1916)
   ries.debian.org: Franz Ries (April 7th, 1846 - January 20th, 1932)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
-  rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
   rossini.debian.org: Gioachino Rossini (February 29th, 1792 - November 13th, 1868)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
   salieri.debian.org: Antonio Salieri (August 18th, 1750 - May 7th, 1825)