Retire ftp.d.o role, it is unused

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 1430667..617a63c 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -44,9 +44,6 @@ roles:
     - geo3.debian.org
   extranrpeclient:
     - denis.debian.org
-  ftp.d.o:
-    # also see debian_mirror
-    - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
   ftp.upload.d.o:

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fd97415..195d991 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -70,12 +70,6 @@ class roles {
        if has_role('debian_mirror') {
                include roles::debian_mirror
        }
-       if has_role('ftp.d.o') {
-               vsftpd::site { 'ftp':
-                       ensure  => absent,
-                       root    => '/nonexistent',
-               }
-       }
        if has_role('ftp_master') {
                include roles::ftp_master
                include roles::dakmaster

diff --git a/modules/tcp_bbr/manifests/init.pp b/modules/tcp_bbr/manifests/init.pp
index a486075..78e966e 100644 (file)
--- a/modules/tcp_bbr/manifests/init.pp
+++ b/modules/tcp_bbr/manifests/init.pp
@@ -11,7 +11,6 @@ class tcp_bbr {
                   has_role('debian_mirror') or
                   has_role('debug_mirror') or
                   has_role('dgit_git') or
-                  has_role('ftp.d.o') or
                   has_role('ftp.upload.d.o') or
                   has_role('ftp_master') or
                   has_role('git_master') or