From 01a4d3d18d575797c648fa246da9d4d07cdd8eb3 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 5 Oct 2017 09:57:42 +0200 Subject: [PATCH] Drop remaining debian-ports-cd code --- modules/roles/files/ports_master/rsyncd.conf | 5 ----- modules/roles/manifests/ports_mirror.pp | 1 - modules/sudo/files/sudoers | 1 - 3 files changed, 7 deletions(-) diff --git a/modules/roles/files/ports_master/rsyncd.conf b/modules/roles/files/ports_master/rsyncd.conf index b9a5ef7d0..8a980cc6d 100644 --- 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 65a1ad97b..709dc5a17 100644 --- 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 9f3f9cbee..811424380 100644 --- 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 -- 2.20.1