security_mirror: use /srv/ instead of deprecated /org/

Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/modules/roles/files/security_mirror/rsyncd.conf b/modules/roles/files/security_mirror/rsyncd.conf
index d419156fc64497c5f38db1a48f6f2acd4ed0aec2..d275891e1e96cff11b1c49e6b0202ae2ac9e2968 100644 (file)
--- a/modules/roles/files/security_mirror/rsyncd.conf
+++ b/modules/roles/files/security_mirror/rsyncd.conf
@@ -9,7 +9,7 @@ timeout = 1200
 log file =  /var/log/rsyncd/rsyncd.log
 
 [debian-security]
-  path = /org/ftp.root/debian-security
+  path = /srv/ftp.root/debian-security
   comment = Debian security archive
   read only = true
 

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index 3507a08d8eac71235bbe4f11b9e0e464d4e2035e..95677c7db50453eaabdbaf43165d8a6f8f6ea8de 100644 (file)
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -28,7 +28,7 @@
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
 
-   Alias /debian-security /org/security.debian.org/ftp
+   Alias /debian-security /srv/security.debian.org/ftp
 
    <Directory /srv/ftp.root/debian-security/pool>
       <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">