Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Steve McIntyre 2017-06-22 17:25:02 +01:00
parent 00eb0a453e
commit 14a650a569
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/jigdo-watcher
View File

@ -5,13 +5,13 @@ STATE=/home/stevem/watch-state
R_HOST=cd-builder.debian.net R_HOST=cd-builder.debian.net
R_LOC=testing/weekly-builds R_LOC=testing/weekly-builds
R_WEBROOT=$R_LOC 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 R_USER=steve
CACHE_DIR=/org/jigdo-snapshots CACHE_DIR=/srv/jigdo-snapshots
OUT_DIR=/org/jigdo-area/testing OUT_DIR=/srv/jigdo-area/testing
MIRROR=/org/ftp/debian MIRROR=/srv/ftp/debian
SNAP_AREA=/org/jigdo-area/snapshot SNAP_AREA=/srv/jigdo-area/snapshot
LOCK=$STATE/lock LOCK=$STATE/lock
# Check to see if another sync is in progress # Check to see if another sync is in progress

2
contrib/report_build_error
View File

@ -11,7 +11,7 @@ ARCH=$3
RESULTS=$4 RESULTS=$4
OUTFILE=$OUTDIR/$ARCH/HEADER.html 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" OUTLOGS="build-logs/$DATE"
grep -q WARNING $OUTFILE grep -q WARNING $OUTFILE

8
update-cd
View File

@ -14,8 +14,8 @@ set -e
# Configuration goes here. # Configuration goes here.
# Where is your mirror? # Where is your mirror?
MIRROR_NORM=/org/cdbuilder.debian.org/src/ftp/debian MIRROR_NORM=/srv/cdbuilder.debian.org/src/ftp/debian
MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian MIRROR_AMD64=/srv/cdbuilder.debian.org/src/ftp/debian-amd64/debian
# Do you want non-free? 1 for yes, 0 for no # Do you want non-free? 1 for yes, 0 for no
NONFREE=0 NONFREE=0
@ -37,13 +37,13 @@ JTE=1
BT=1 BT=1
# The working directory to use. MUST be on the same partition as the mirror. # 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 ... # Building squeeze cd set ...
CODENAME=squeeze CODENAME=squeeze
# Path where the images will be written # 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) # Location(s) for the snapshot(s)
SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last' SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last'