[Git][ftp-team/dak][master] 11 commits: Merge branch 'master' into deploy

[Joerg Jaspert <joerg@debian.org>]

Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

• 0fe9f609
  by Joerg Jaspert at 2018-04-08T10:45:53+02:00

  Merge branch 'master' into deploy
  
  * master:
    First define ARG then source vars - only run dak commands if not deploy
    debian-security: Add hourly cronscript
    debian-security: Add mirror cronscript
    debian-security: Use cronscript for dinstall part
    debian-security: Add cronscript
    Expect existing environment in cronscript
    Remove unused variable
  

• 0f1e75ec
  by Ansgar Burchardt at 2018-04-08T11:26:44+02:00

  Merge branch 'master' into deploy
  

• 934a8a50
  by Joerg Jaspert at 2018-04-08T11:56:46+02:00

  Merge branch 'master' into deploy
  
  * master:
    Unify script vars
  

• 3f3601b2
  by Joerg Jaspert at 2018-04-08T12:04:14+02:00

  Merge branch 'master' into deploy
  
  * master:
    Fixup sourcing of common variables
  

• 20eaf4aa
  by Joerg Jaspert at 2018-04-08T12:07:48+02:00

  Merge branch 'master' into deploy
  
  * master:
    stagedir gets modified later
  

• 4ea35e73
  by Joerg Jaspert at 2018-04-08T12:13:21+02:00

  source based on (possibly overriden) configdir
  

• 4aa05acc
  by Joerg Jaspert at 2018-04-08T12:20:28+02:00

  Be spethial, deploy, will you.
  

• 62f5cd08
  by Joerg Jaspert at 2018-04-08T12:24:08+02:00

  Spethial, cant be readonly here, sourced again by ../confpart file
  

• 25dbdcee
  by Joerg Jaspert at 2018-04-08T12:26:17+02:00

  Allow deploy script on security
  

• 90107682
  by Joerg Jaspert at 2018-04-08T12:29:24+02:00

  Merge branch 'deploy'
  
  * deploy:
    Allow deploy script on security
    Spethial, cant be readonly here, sourced again by ../confpart file
    Be spethial, deploy, will you.
    source based on (possibly overriden) configdir
  

• bf9ee0fb
  by Joerg Jaspert at 2018-04-08T12:41:00+02:00

  Merge branch 'master' of salsa.debian.org:ftp-team/dak
  
  * 'master' of salsa.debian.org:ftp-team/dak:
    external-signatures.conf: add fwupdate
  

4 changed files:

• config/debian-security/vars
• config/debian/vars
• − config/deploy/vars
• + config/deploy/vars

Changes:

config/debian-security/vars

---

1		-# locations used by many scripts
	1	+# -*- mode:sh -*-
2	2
3	3	declare -r functionname=security-master.debian.org
4	4	declare -r confpart=debian-security
...	...	@@ -12,10 +12,10 @@ declare -r masterdir=${base}/dak/
12	12	export configdir=${configdir:-${masterdir}/config/${confpart}/}
13	13
14	14	# And the following types of cronscripts exists
15		-declare -r POSSIBLEARGS='+(unchecked-dinstall|hourly|mirror)'
	15	+declare -r POSSIBLEARGS='+(unchecked-dinstall|hourly|mirror|deploy)'
16	16
17	17	# And get all the tons of other variables
18		-source ${masterdir}/config/common/variables
	18	+source ${configdir}/../common/variables
19	19
20	20	# Stuff for old cron scripts not yet switched to new style
21	21	declare -r uploadhost=ftp-master.debian.org

config/debian/vars

---

...	...	@@ -15,4 +15,4 @@ export configdir=${configdir:-${masterdir}/config/${confpart}/}
15	15	declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror|deploy)'
16	16
17	17	# And get all the tons of other variables
18		-source ${masterdir}/config/common/variables
	18	+source ${configdir}/../common/variables

config/deploy/vars deleted

---

1		-../debian/vars
		\ No newline at end of file

config/deploy/vars

---

	1	+# -*- mode:sh -*-
	2	+
	3	+if [[ -d /srv/security-master.debian.org ]]; then
	4	+ functionname=security-master.debian.org
	5	+ confpart=debian-security
	6	+else
	7	+ functionname=ftp-master.debian.org
	8	+ confpart=debian
	9	+fi
	10	+
	11	+base=/srv/${functionname}
	12	+masterdir=${base}/dak/
	13	+export configdir=${configdir:-${masterdir}/config/${confpart}/}
	14	+
	15	+# And get all the tons of other variables
	16	+source ${configdir}/../${confpart}/vars

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.