Commit 14a650a5 authored by Steve McIntyre's avatar Steve McIntyre
Browse files

Switch locations from /org/ to /src/ across our config

parent 00eb0a45

contrib/jigdo-watcher

+5 −5
Original line number Diff line number Diff line
@@ -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

contrib/report_build_error

+1 −1
Original line number Diff line number Diff line
@@ -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

update-cd

+4 −4
Original line number Diff line number Diff line
@@ -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'