[PATCH] Switch from /org to /srv in directory configuration
/org has been obsoleted by /srv for many years on debian.org hosts.
---
contrib/jigdo-watcher | 10 +++++-----
contrib/report_build_error | 2 +-
update-cd | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/contrib/jigdo-watcher b/contrib/jigdo-watcher
index 70e92a9..9186315 100755
--- a/contrib/jigdo-watcher
+++ b/contrib/jigdo-watcher
@@ -5,13 +5,13 @@ STATE=/home/stevem/watch-state
R_HOST=cd-builder.debian.net
R_LOC=testing/weekly-builds
R_WEBROOT=$R_LOC
-R_RSYNCROOT=/org/cdimage.debian.org/www/$R_LOC
+R_RSYNCROOT=/srv/cdimage.debian.org/www/$R_LOC
R_USER=steve
-CACHE_DIR=/org/jigdo-snapshots
-OUT_DIR=/org/jigdo-area/testing
-MIRROR=/org/ftp/debian
-SNAP_AREA=/org/jigdo-area/snapshot
+CACHE_DIR=/srv/jigdo-snapshots
+OUT_DIR=/srv/jigdo-area/testing
+MIRROR=/srv/ftp/debian
+SNAP_AREA=/srv/jigdo-area/snapshot
LOCK=$STATE/lock
# Check to see if another sync is in progress
diff --git a/contrib/report_build_error b/contrib/report_build_error
index 867887b..53479d7 100755
--- a/contrib/report_build_error
+++ b/contrib/report_build_error
@@ -11,7 +11,7 @@ ARCH=$3
RESULTS=$4
OUTFILE=$OUTDIR/$ARCH/HEADER.html
-INLOGS="/org/cdbuilder.debian.org/dst/deb-cd/log"
+INLOGS="/srv/cdbuilder.debian.org/dst/deb-cd/log"
OUTLOGS="build-logs/$DATE"
grep -q WARNING $OUTFILE
diff --git a/update-cd b/update-cd
index 18c8bb2..88ab1bb 100755
--- a/update-cd
+++ b/update-cd
@@ -14,8 +14,8 @@ set -e
# Configuration goes here.
# Where is your mirror?
-MIRROR_NORM=/org/cdbuilder.debian.org/src/ftp/debian
-MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian
+MIRROR_NORM=/srv/cdbuilder.debian.org/src/ftp/debian
+MIRROR_AMD64=/srv/cdbuilder.debian.org/src/ftp/debian-amd64/debian
# Do you want non-free? 1 for yes, 0 for no
NONFREE=0
@@ -37,13 +37,13 @@ JTE=1
BT=1
# The working directory to use. MUST be on the same partition as the mirror.
-TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/squeeze-update/cd-work
+TDIR=/srv/cdbuilder.debian.org/src/deb-cd/tmp/squeeze-update/cd-work
# Building squeeze cd set ...
CODENAME=squeeze
# Path where the images will be written
-OUT=/org/cdbuilder.debian.org/src/deb-cd/tmp/squeeze-update/cd-out
+OUT=/srv/cdbuilder.debian.org/src/deb-cd/tmp/squeeze-update/cd-out
# Location(s) for the snapshot(s)
SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last'
--
2.11.0
Reply to: