[Git][ftp-team/dak][deploy] 4 commits: pointrelease: use correct variable

[Joerg Jaspert <joerg@debian.org>]

Title: GitLab

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

Commits:

• 6824e920
  by Ansgar Burchardt at 2018-07-14T12:00:08+02:00

  pointrelease: use correct variable
  

• 2118f8d1
  by Ansgar Burchardt at 2018-07-14T12:03:03+02:00

  pointrelease: removals from the script file are also removals
  

• ea49295d
  by Joerg Jaspert at 2018-07-19T22:43:33+02:00

  Adjust hostname
  

• 9f0001f9
  by Joerg Jaspert at 2018-07-19T22:57:18+02:00

  Merge branch 'master' into deploy
  
  * master:
    Adjust hostname
    pointrelease: removals from the script file are also removals
    pointrelease: use correct variable
  

3 changed files:

• config/debian/pointrelease
• config/homedir/ssh/ftpmaster-config
• config/homedir/ssh/security-config

Changes:

config/debian/pointrelease

---

...	...	@@ -220,11 +220,14 @@ if [[ ${suitename} != jessie ]]; then
220	220	fi
221	221
222	222	log "RM time"
223		-if ${wget} -O "removallist" "${release_base}/removals.${target_suite}"; then
	223	+if ${wget} -O "removallist" "${release_base}/removals.${suitename}"; then
224	224	echo "Please check removallist file, I am going to run it as shell script when you confirm"
225	225	confirm
226	226	$EDITOR removallist
227	227	bash removallist
	228	+ if [ -s removallist ]; then
	229	+ hadrms=1
	230	+ fi
228	231	fi
229	232
230	233	echo "Any more removals to be done?"

config/homedir/ssh/ftpmaster-config

---

...	...	@@ -26,7 +26,7 @@ Host dep11-sync
26	26	IdentityFile /srv/ftp-master.debian.org/s3kr1t/appstream.rsa
27	27
28	28	Host morgue-sync
29		- Hostname stabile.debian.org
	29	+ Hostname lw03.debian.org
30	30	User dak
31	31	IdentityFile /srv/ftp-master.debian.org/s3kr1t/push_morgue
32	32

config/homedir/ssh/security-config

---

...	...	@@ -16,7 +16,7 @@ Host buildd
16	16	ControlPersist 60
17	17
18	18	Host morgue-sync
19		- Hostname stabile.debian.org
	19	+ Hostname lw03.debian.org
20	20	User dak
21	21	IdentityFile /srv/security-master.debian.org/s3kr1t/push_morgue
22	22

—
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.