Drop remaining debian-ports-cd code

diff --git a/modules/roles/files/ports_master/rsyncd.conf b/modules/roles/files/ports_master/rsyncd.conf
index b9a5ef7..8a980cc 100644 (file)
--- a/modules/roles/files/ports_master/rsyncd.conf
+++ b/modules/roles/files/ports_master/rsyncd.conf
@@ -16,11 +16,6 @@ strict modes = false
   auth users = *
   secrets file = /home/archvsync/rsyncd/debian-ports.secrets
 
-[debian-ports-cd]
-  path = /srv/ports-master.debian.org/ftp/debian-ports-cd
-  auth users = *
-  secrets file = /home/archvsync/rsyncd/debian-ports-cd.secrets
-
 [debian-ports-buildd-dists]
   path = /srv/static.debian.org/master/incoming.ports.debian.org-current-live/buildd/dists
   auth users = *

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 65a1ad9..709dc5a 100644 (file)
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -3,7 +3,6 @@ class roles::ports_mirror {
 
        $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
        $archive_root = "${mirror_basedir_prefix}debian-ports"
-       $archive_cd_root = "${mirror_basedir_prefix}debian-ports-cd"
 
        $vhost_listen = $::hostname ? {
                klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 9f3f9cb..8114243 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -273,7 +273,6 @@ nagiosadm   tchaikovsky=(root)              NOPASSWD: /usr/sbin/service icinga reload
 
 # ports stuff
 mini-dak       porta=(archvsync)       NOPASSWD: /home/archvsync/signal_ports
-mini-dak       porta=(archvsync)       NOPASSWD: /home/archvsync/signal_ports-cd
 
 # temporary, for debugging
 thijs          klecker=(root)          /usr/sbin/tcpdump