From: Simon Paillard <spaillard@debian.org>
Date: Thu, 26 Jun 2014 17:30:31 +0000 (+0200)
Subject: security_mirror: use /srv/ instead of deprecated /org/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=467b8fc74ef4993b5d107da21e83fbeeabd3b892;hp=05488a0109e6a30f94e882191fd2371ee75cbd7a;p=mirror%2Fdsa-puppet.git

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 d419156fc..d275891e1 100644
--- 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 3507a08d8..95677c7db 100644
--- 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)$">