From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 16 Feb 2018 20:23:25 +0000 (+0100)
Subject: Remove /srv/ftp.root from security mirrors
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6f13ef1cbb275fd963bd8e8aa9542cfdc91f4daf;p=mirror%2Fdsa-puppet.git

Remove /srv/ftp.root from security mirrors

They do not serve FTP anymore so the archive can be located directly
in /srv/mirrors/debian-security like for other archive.

Do not create the /srv/mirrors/debian-security, as it might still be a
symlink, and ftpsync will create it. This actually matches what is done
for the other archive.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9bb613907..89c1e1977 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -10,24 +10,6 @@ class roles::security_mirror {
 		default         => [ '[::]' ],
 	}
 
-	file { '/srv/mirrors/debian-security':
-		ensure => link,
-		target => '../ftp.root/debian-security',
-	}
-	file { '/srv/ftp.root':
-		ensure  => directory,
-	}
-	file { '/srv/ftp.root/.nobackup':
-		ensure  => present,
-		content => '',
-	}
-	file { '/srv/ftp.root/debian-security':
-		ensure => directory,
-		owner  => 1176, # archvsync
-		group  => 1176, # archvsync
-		mode   => '0755',
-	}
-
 	include apache2::expires
 	include apache2::rewrite