Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
0e70d75c
by Ansgar Burchardt at 2019-07-17T06:42:21Z
-
d6724531
by Ansgar Burchardt at 2019-07-17T06:44:31Z
2 changed files:
Changes:
... | ... | @@ -320,7 +320,7 @@ dak admin suite add ${new_testing}-backports-debug '' origin="Debian Backports" |
320 | 320 |
|
321 | 321 |
for suite in ${new_oldstable}-backports-sloppy ${new_oldstable}-backports-sloppy-debug; do
|
322 | 322 |
dak admin s-c add ${suite} main contrib non-free
|
323 |
- dak admin s-a add ${suite} source all $(dak admin s-a list-arch ${new_stable})
|
|
323 |
+ dak admin s-a add ${suite} source all $(dak admin s-a list-arch ${new_oldstable})
|
|
324 | 324 |
done
|
325 | 325 |
for suite in ${new_stable}-backports-debug; do
|
326 | 326 |
dak admin s-c add ${suite} main contrib non-free
|
... | ... | @@ -366,6 +366,10 @@ begin; |
366 | 366 |
update suite set signingkeys = ARRAY['126C0D24BD8A2942CC7DF8AC7638D0442B90D010', 'E1CF20DDFFE4B89E802658F1E0B11894F66AEC98'] where suite_name in ('stretch-backports-sloppy', 'stretch-backports-sloppy-debug', 'buildd-stretch-backports-sloppy');
|
367 | 367 |
update suite set signingkeys = ARRAY['E1CF20DDFFE4B89E802658F1E0B11894F66AEC98', '80D15823B7FD1561F9F7BCDDDC30D7C23CBBABEE'] WHERE suite_name IN ('buster-backports', 'buster-backports-debug', 'buildd-buster-backports', 'bullseye-backports', 'bullseye-backports-debug', 'buildd-bullseye-backports');
|
368 | 368 |
|
369 |
+ insert into suite_permission (suite_id, role)
|
|
370 |
+ select id, 'backports' from suite
|
|
371 |
+ where codename in (concat(:'new_oldstable', '-backports-sloppy'), concat(:'new_testing', '-backports'));
|
|
372 |
+ |
|
369 | 373 |
commit;
|
370 | 374 |
|
371 | 375 |
for s in ${new_oldstable}-backports-sloppy{,-debug} ${new_stable}-backports{,-debug} ${new_testing}-backports{,-debug}; do
|
... | ... | @@ -27,7 +27,7 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars |
27 | 27 |
. $SCRIPTVARS
|
28 | 28 |
|
29 | 29 |
usage() {
|
30 |
- echo "usage: $0 <lock> <host1> <host2> sync|code"
|
|
30 |
+ echo "usage: $0 <lock> <host1> <host2> sync|code <timeout=30m>"
|
|
31 | 31 |
echo
|
32 | 32 |
echo "sync dd-accessible copy of the archive"
|
33 | 33 |
echo
|
... | ... | @@ -36,11 +36,12 @@ usage() { |
36 | 36 |
echo " host1: hostname for syncing /srv/ftp-master.debian.org"
|
37 | 37 |
echo " host2: hostname for syncing /srv/ftp.debian.org"
|
38 | 38 |
echo " sync|code: sync syncs everything"
|
39 |
+ echo " timeout: timeout for rsync, see man:timeout(1)"
|
|
39 | 40 |
echo " code only syncs the dak/ directory (uses host1 value as target)"
|
40 | 41 |
exit ${1:-0}
|
41 | 42 |
}
|
42 | 43 |
|
43 |
-if [ $# -ne 4 ]; then
|
|
44 |
+if [ $# -lt 4 ]; then
|
|
44 | 45 |
usage 1
|
45 | 46 |
fi
|
46 | 47 |
|
... | ... | @@ -48,6 +49,7 @@ lockfile="${lockdir}/${1}" |
48 | 49 |
host1="${2}"
|
49 | 50 |
host2="${3}"
|
50 | 51 |
mode="${4}"
|
52 |
+timeout="${5:-30m}"
|
|
51 | 53 |
|
52 | 54 |
# extra options for rsync of /srv/ftp-master.debian.org
|
53 | 55 |
extra1=""
|
... | ... | @@ -61,6 +63,7 @@ trap cleanup EXIT TERM HUP INT QUIT |
61 | 63 |
if lockfile -r3 "${lockfile}" 2> /dev/null; then
|
62 | 64 |
case "${mode}" in
|
63 | 65 |
sync)
|
66 |
+ timeout --verbose "${timeout}" \
|
|
64 | 67 |
rsync -aH -B8192 \
|
65 | 68 |
${extra1} \
|
66 | 69 |
--exclude "/.nobackup" \
|
... | ... | @@ -84,12 +87,12 @@ if lockfile -r3 "${lockfile}" 2> /dev/null; then |
84 | 87 |
--exclude "/public/incoming.debian.org" \
|
85 | 88 |
--exclude "/tiffani/" \
|
86 | 89 |
--delete --delete-after \
|
87 |
- --timeout 3600 \
|
|
88 | 90 |
-e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \
|
89 | 91 |
/srv/ftp-master.debian.org/ "${host1}:/srv/ftp-master.debian.org/"
|
90 | 92 |
# command for the remote side:
|
91 | 93 |
# command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp-master.debian.org/"
|
92 | 94 |
|
95 |
+ timeout --verbose "${timeout}" \
|
|
93 | 96 |
rsync -aH -B8192 \
|
94 | 97 |
--exclude "/.nobackup" \
|
95 | 98 |
--exclude mirror \
|
... | ... | @@ -98,17 +101,16 @@ if lockfile -r3 "${lockfile}" 2> /dev/null; then |
98 | 101 |
--exclude .da-backup.trace \
|
99 | 102 |
--exclude web-users/ \
|
100 | 103 |
--delete --delete-after \
|
101 |
- --timeout 3600 \
|
|
102 | 104 |
-e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \
|
103 | 105 |
/srv/ftp.debian.org/ "${host2}:/srv/ftp.debian.org/"
|
104 | 106 |
# command for the remote side:
|
105 | 107 |
# command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp.debian.org/"
|
106 | 108 |
;;
|
107 | 109 |
code)
|
110 |
+ timeout --verbose "${timeout}" \
|
|
108 | 111 |
rsync -aH -B8192 \
|
109 | 112 |
--exclude "/.nobackup" \
|
110 | 113 |
--delete --delete-after \
|
111 |
- --timeout 3600 \
|
|
112 | 114 |
-e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \
|
113 | 115 |
/srv/ftp-master.debian.org/dak/ "${host1}:/srv/ftp-master.debian.org/dak/"
|
114 | 116 |
# command for the remote side:
|