Commits:
-
95825779
by Joerg Jaspert at 2023-06-12T22:20:00+02:00
Rotate cronscripts logs
Configurable per variable (override in local vars file), we keep (by
default) only 60 days
-
5ab5cd79
by Cyril Brulebois at 2023-06-12T22:53:30+02:00
dinstall: rsync dep11 data for experimental too
-
a10d99a9
by Ansgar at 2023-06-14T21:21:26+02:00
import-into-debian-archive.txt: remind webmaster to archive stuff too
-
ff67f7d5
by Laura Arjona Reina at 2023-06-16T10:26:21+00:00
Update import-into-debian-archive.txt: remind webmaster about updating the corresponding web pages in www.debian.org too (releases/index and distrib/archive at least)
-
739f238d
by Ansgar at 2023-06-24T17:28:19+02:00
Merge remote-tracking branches 'origin/merge-requests/271' and 'origin/merge-requests/272'
-
aeb76f59
by Mark Hymers at 2023-07-23T10:23:30+01:00
Add riscv64 keyring for uploads
-
eb239686
by Mark Hymers at 2023-07-23T09:44:02+00:00
Merge branch 'mhy/add_riscv64' into 'master'
Add riscv64 keyring for uploads
See merge request ftp-team/dak!276
-
8ce54cc2
by Mark Hymers at 2023-07-23T10:44:42+01:00
Merge commit 'eb239686b9d9e3d5835b4448b2bfef234c7d007b' into deploy
7 changed files:
Changes:
config/common/variables
| ... |
... |
@@ -35,6 +35,9 @@ PATH=${masterdir}:${PATH} |
|
35
|
35
|
# By default, add no timestamps to stage logs
|
|
36
|
36
|
TIMESTAMP=false
|
|
37
|
37
|
|
|
|
38
|
+# How many days of logfiles to keep?
|
|
|
39
|
+declare -r logkeep=${logkeep:-60}
|
|
|
40
|
+
|
|
38
|
41
|
declare -r HOSTNAME=$(hostname -s)
|
|
39
|
42
|
|
|
40
|
43
|
# where do we want mails to go? For example log entries made with error()
|
config/debian/cronscript
| ... |
... |
@@ -287,6 +287,9 @@ function laststeps() { |
|
287
|
287
|
# and ensure its no longer used
|
|
288
|
288
|
exec > "$logdir/after${PROGRAM}.log" 2>&1
|
|
289
|
289
|
|
|
|
290
|
+ # Rotate out old logfiles
|
|
|
291
|
+ find ${logdir}/${PROGRAM}_*.log.bz2 -mtime +${logkeep} -delete
|
|
|
292
|
+
|
|
290
|
293
|
# Now, at the very (successful) end of this run, make sure we remove
|
|
291
|
294
|
# our stage files, so the next script run will do it all again.
|
|
292
|
295
|
if [[ ${successval} -eq 0 ]]; then
|
config/debian/dinstall.variables
| ... |
... |
@@ -22,7 +22,7 @@ DINSTALLSTATE="${webdir}/dinstall.status" |
|
22
|
22
|
# get em out of the db.
|
|
23
|
23
|
extimportdists=""
|
|
24
|
24
|
if [ "${functionname}" = ftp-master.debian.org ]; then
|
|
25
|
|
- for suite in testing unstable; do
|
|
|
25
|
+ for suite in testing unstable experimental; do
|
|
26
|
26
|
codename=$(dak admin suite-config get-value ${suite} codename)
|
|
27
|
27
|
extimportdists="${extimportdists} ${codename}"
|
|
28
|
28
|
done
|
docs/import-into-debian-archive.txt
| ... |
... |
@@ -109,3 +109,5 @@ for d in stretch-backports-debug stretch-backports-sloppy-debug; do |
|
109
|
109
|
done
|
|
110
|
110
|
|
|
111
|
111
|
# + jdupes again
|
|
|
112
|
+
|
|
|
113
|
+# Remind webmaster to update the corresponding pages in www.debian.org and remove stuff from packages.d.o |
tools/debianqueued-0.9/config-security-upload
| ... |
... |
@@ -57,6 +57,7 @@ $statusdelay = 30; |
|
57
|
57
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
|
|
58
|
58
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
|
|
59
|
59
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ppc64el-keyring.gpg",
|
|
|
60
|
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-riscv64-keyring.gpg",
|
|
60
|
61
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
|
|
61
|
62
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390x-keyring.gpg",
|
|
62
|
63
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
|
tools/debianqueued-0.9/config-upload
| ... |
... |
@@ -59,6 +59,7 @@ $statusdelay = 30; |
|
59
|
59
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
|
|
60
|
60
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
|
|
61
|
61
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ppc64el-keyring.gpg",
|
|
|
62
|
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-riscv64-keyring.gpg",
|
|
62
|
63
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
|
|
63
|
64
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390x-keyring.gpg",
|
|
64
|
65
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
|
tools/debianqueued-0.9/config-usper
| ... |
... |
@@ -59,6 +59,7 @@ $statusdelay = 30; |
|
59
|
59
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
|
|
60
|
60
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
|
|
61
|
61
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ppc64el-keyring.gpg",
|
|
|
62
|
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-riscv64-keyring.gpg",
|
|
62
|
63
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
|
|
63
|
64
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390x-keyring.gpg",
|
|
64
|
65
|
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
|
|