Serve security mirrors from /srv/mirrors/debian-security

In preparation for the /srv/ftp.root removal

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

diff --git a/modules/roles/files/security_mirror/rsyncd.conf b/modules/roles/files/security_mirror/rsyncd.conf
index f94ab03..f70a1a5 100644 (file)
--- a/modules/roles/files/security_mirror/rsyncd.conf
+++ b/modules/roles/files/security_mirror/rsyncd.conf
@@ -13,5 +13,5 @@ ignore nonreadable = true
 strict modes = false
 
 [debian-security]
-  path = /srv/ftp.root/debian-security
+  path = /srv/mirrors/debian-security
   comment = Debian security archive

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index bd1e40c..3d79591 100644 (file)
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -5,7 +5,7 @@
 
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
-   DocumentRoot /srv/ftp.root/debian-security
+   DocumentRoot /srv/mirrors/debian-security
    ServerPath /debian-security
    ServerName security.debian.org
    ServerAlias security.ipv6.debian.org
@@ -28,8 +28,8 @@
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
 
-   Alias /debian-security /srv/ftp.root/debian-security
-   Use ftp-archive /srv/ftp.root/debian-security
+   Alias /debian-security /srv/mirrors/debian-security
+   Use ftp-archive /srv/mirrors/debian-security
 
    Alias /_health /run/dsa-mirror-health-security/health
    <Directory /run/dsa-mirror-health-security/>