From 4c15843eaaa8a52e6f6603ead81f37c1e925a067 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 16 Feb 2018 21:07:56 +0100 Subject: [PATCH] Serve security mirrors from /srv/mirrors/debian-security In preparation for the /srv/ftp.root removal Signed-off-by: Aurelien Jarno --- modules/roles/files/security_mirror/rsyncd.conf | 2 +- .../roles/templates/security_mirror/security.debian.org.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/roles/files/security_mirror/rsyncd.conf b/modules/roles/files/security_mirror/rsyncd.conf index f94ab03ee..f70a1a57a 100644 --- 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 bd1e40c54..3d79591dd 100644 --- a/modules/roles/templates/security_mirror/security.debian.org.erb +++ b/modules/roles/templates/security_mirror/security.debian.org.erb @@ -5,7 +5,7 @@ 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 -- 2.20.1