From 8929ba2f4641085124c122ca969fea0fe373d5b4 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 8 Nov 2015 17:06:37 +0100
Subject: [PATCH] Use /srv instead of /org

---
 config/debian-security/apache.conf  | 6 +++---
 config/debian-security/dak.conf-etc | 2 +-
 config/debian/common                | 4 ++--
 docs/TODO.old                       | 2 +-
 scripts/debian/ftpstats.R           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/debian-security/apache.conf b/config/debian-security/apache.conf
index 4886ab0d..7da50e99 100644
--- a/config/debian-security/apache.conf
+++ b/config/debian-security/apache.conf
@@ -13,9 +13,9 @@ BrowserMatch EmailSiphon spammer
   CustomLog /var/log/apache2/security-master.debian.org-access.log combined
   LogLevel warn
 
-  Alias /debian-security /org/security.debian.org/archive/debian-security/
+  Alias /debian-security /srv/security.debian.org/archive/debian-security/
   Alias /debian-security-buildd /srv/security-master.debian.org/buildd/debian-security-buildd/
-  Alias /buildd/ /org/security-master.debian.org/buildd/
+  Alias /buildd/ /srv/security-master.debian.org/buildd/
 
   <LocationMatch "^/(buildd|buildd-squeeze|buildd-wheezy|debian-security|debian-security-buildd)/">
     order deny,allow
@@ -34,7 +34,7 @@ BrowserMatch EmailSiphon spammer
 
     AuthName "security.debian.org"
     AuthType Basic
-    AuthUserFile /org/security-master.debian.org/apache.htpasswd
+    AuthUserFile /srv/security-master.debian.org/apache.htpasswd
     require valid-user
 
     # either valid IP address or valid user are sufficient
diff --git a/config/debian-security/dak.conf-etc b/config/debian-security/dak.conf-etc
index ce2df0f9..ce756354 100644
--- a/config/debian-security/dak.conf-etc
+++ b/config/debian-security/dak.conf-etc
@@ -2,6 +2,6 @@ Config
 {
   seger.debian.org
   {
-    DakConfig           "/org/security-master.debian.org/dak/config/debian-security/dak.conf";
+    DakConfig           "/srv/security-master.debian.org/dak/config/debian-security/dak.conf";
   }
 }
diff --git a/config/debian/common b/config/debian/common
index 9d00cf9a..ee762f23 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -26,7 +26,7 @@ function debug () {
 function wbtrigger() {
     SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240"
     if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then
-        ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often
+        ssh -q -q ${SSHOPT} wbadm@buildd /srv/wanna-build/trigger.often
     fi
     rm -f "${LOCK_BUILDD}"
 }
@@ -130,7 +130,7 @@ function sync_debbugs () {
     mkdir -p $queuedir/bts_version_track_archive/${timestamp}
     rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp}
     rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${timestamp} # remove if empty.
-    rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
+    rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/srv/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
     NOW=$(date +%s)
     TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)
     DIFF=$(( NOW - TSTAMP ))
diff --git a/docs/TODO.old b/docs/TODO.old
index 2aa065de..eacbadd1 100644
--- a/docs/TODO.old
+++ b/docs/TODO.old
@@ -123,7 +123,7 @@ Others
   o 'dak import-users-from-passwd' should sync debadmin and ftpmaster (?)
 
   o <drow> Can't read file.:
-  /org/security.debian.org/queue/accepted/accepted/apache-perl_1.3.9-14.1-1.21.20000309-1_sparc.dak.
+  /srv/security.debian.org/queue/accepted/accepted/apache-perl_1.3.9-14.1-1.21.20000309-1_sparc.dak.
   You assume that the filenames are relative to accepted/, might want
   to doc or fix that.
 
diff --git a/scripts/debian/ftpstats.R b/scripts/debian/ftpstats.R
index 684dbed1..608b4263 100644
--- a/scripts/debian/ftpstats.R
+++ b/scripts/debian/ftpstats.R
@@ -14,6 +14,6 @@ plotsize <- function(file,title,p,height=11.8,width=16.9) {
 t <- (read.table("/srv/ftp-master.debian.org/misc/ftpstats.data",sep=",",header=0,row.names=1,col.names=cname))/1024/1024
 v <- t[(length(t$all)-90):(length(t$all)),1:19]
 
-#plotsize("/org/ftp.debian.org/web/size.png","Daily dinstall run size by arch",t)
+#plotsize("/srv/ftp.debian.org/web/size.png","Daily dinstall run size by arch",t)
 plotsize("/srv/ftp.debian.org/web/size-quarter.png","Daily dinstall run size by arch (past quarter)",v)
 
-- 
2.39.5