Remove ftp-upcoming

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 83c6ed3..b734fcb 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -226,9 +226,6 @@ host_settings:
     - kokkonen.debian.org
     - santoro.debian.org
     - senfl.debian.org
-  'apache2_ftp-upcoming_mirror':
-    - klecker.debian.org
-    - rietz.debian.org
   not-bacula-client:
     - abel.debian.org
     - agricola.debian.org

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index f62c282..e731327 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -22,14 +22,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
@@ -98,14 +90,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
@@ -174,14 +158,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
@@ -250,14 +226,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
@@ -326,14 +294,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
@@ -402,14 +362,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
@@ -478,14 +430,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
@@ -554,14 +498,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
@@ -630,14 +566,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";

diff --git a/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org b/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org
deleted file mode 100644 (file)
index 0849ad1..0000000
--- a/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org
+++ /dev/null
@@ -1,16 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-<VirtualHost *:80>
-   ServerAdmin ftpmaster@debian.org
-   DocumentRoot /srv/mirrors/buildd-all
-   ServerName ftp-upcoming.debian.org
-
-   ErrorLog /var/log/apache2/ftp-upcoming.debian.org-error.log
-   LogLevel warn
-   CustomLog /var/log/apache2/ftp-upcoming.debian.org-access.log privacy
-
-   IndexOptions FancyIndexing NameWidth=*
-</VirtualHost>

diff --git a/modules/roles/manifests/ftp-upcoming_mirror.pp b/modules/roles/manifests/ftp-upcoming_mirror.pp
deleted file mode 100644 (file)
index 02abb6f..0000000
--- a/modules/roles/manifests/ftp-upcoming_mirror.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class roles::ftp-upcoming_mirror {
-
-       apache2::site { '010-ftp-upcoming.debian.org':
-               site   => 'ftp-upcoming.debian.org',
-               source => 'puppet:///modules/roles/ftp-upcoming_mirror/ftp-upcoming.debian.org',
-       }
-}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d534068..d76823d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -62,10 +62,6 @@ class roles {
                include roles::wiki
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'static_master') {
                include roles::static_master
        }