projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'
[mirror/dsa-puppet.git]
/
hieradata
/
common.yaml
diff --git
a/hieradata/common.yaml
b/hieradata/common.yaml
index
e94ef9b
..
232dff9
100644
(file)
--- a/
hieradata/common.yaml
+++ b/
hieradata/common.yaml
@@
-82,6
+82,9
@@
roles:
- paradis.debian.org
piuparts:
- pejacevic.debian.org
- paradis.debian.org
piuparts:
- pejacevic.debian.org
+ piuparts_slave:
+ - piu-slave-bm-a.debian.org
+ - piu-slave-ubc-01.debian.org
popcon:
- pinel.debian.org
pubsub:
popcon:
- pinel.debian.org
pubsub:
@@
-99,13
+102,19
@@
roles:
- wolkenstein.debian.org
search_frontend:
- cgi-grnet-01.debian.org
- wolkenstein.debian.org
search_frontend:
- cgi-grnet-01.debian.org
+ archvsync_base_additional:
+ # this is usually pulled in by *-mirror or syncproxy roles
+ - dummy
security_master:
- seger.debian.org
security_mirror:
- mirror-anu.debian.org
security_master:
- seger.debian.org
security_mirror:
- mirror-anu.debian.org
+ - mirror-bytemark.debian.org
+ - mirror-conova.debian.org
- mirror-csail.debian.org
- mirror-isc.debian.org
- mirror-umn.debian.org
- mirror-csail.debian.org
- mirror-isc.debian.org
- mirror-umn.debian.org
+ - mirror-accumu.debian.org
- lobos.debian.org
- santoro.debian.org
- setoguchi.debian.org
- lobos.debian.org
- santoro.debian.org
- setoguchi.debian.org
@@
-117,6
+126,11
@@
roles:
- mirror-umn.debian.org
- lobos.debian.org
- villa.debian.org
- mirror-umn.debian.org
- lobos.debian.org
- villa.debian.org
+ security_mirror_no_ftp:
+ # hosts that are not part of security.debian.org but
+ # only participiate in the anycast do not need ftp
+ - mirror-accumu.debian.org
+ - mirror-bytemark.debian.org
security_tracker:
- soriano.debian.org
ssh.upload.d.o:
security_tracker:
- soriano.debian.org
ssh.upload.d.o:
@@
-169,6
+183,7
@@
roles:
- wolkenstein.debian.org
- wuiet.debian.org
syncproxy:
- wolkenstein.debian.org
- wuiet.debian.org
syncproxy:
+ - gretchaninov.debian.org
- klecker.debian.org
- milanollo.debian.org
- mirror-anu.debian.org
- klecker.debian.org
- milanollo.debian.org
- mirror-anu.debian.org
@@
-200,6
+215,10
@@
roles:
postgres_backup_server:
- backuphost.debian.org
- storace.debian.org
postgres_backup_server:
- backuphost.debian.org
- storace.debian.org
+ bacula_director:
+ - dinis.debian.org
+ bacula_storage:
+ - storace.debian.org
dabackup_client:
- moszumanska.debian.org
- lw03.debian.org
dabackup_client:
- moszumanska.debian.org
- lw03.debian.org
@@
-210,21
+229,25
@@
roles:
sreview.debian.org:
- vittoria.debian.org
debian_mirror:
sreview.debian.org:
- vittoria.debian.org
debian_mirror:
- # - klecker.debian.org
- - bilbao.debian.org
- - boman.debian.org
+ - klecker.debian.org
+ - mirror-bytemark.debian.org
+ - mirror-accumu.debian.org
+ - mirror-conova.debian.org
- mirror-isc.debian.org
debian_mirror_onion:
- mirror-isc.debian.org
debian_mirror_onion:
- - bilbao.debian.org
+ - klecker.debian.org
+ - mirror-bytemark.debian.org
- mirror-isc.debian.org
historical_master:
- sibelius.debian.org
historical_mirror:
- gretchaninov.debian.org
- klecker.debian.org
- mirror-isc.debian.org
historical_master:
- sibelius.debian.org
historical_mirror:
- gretchaninov.debian.org
- klecker.debian.org
+ - mirror-conova.debian.org
- sibelius.debian.org
debug_mirror:
- klecker.debian.org
- sibelius.debian.org
debug_mirror:
- klecker.debian.org
+ - mirror-conova.debian.org
- mirror-isc.debian.org
debug_mirror_onion:
- klecker.debian.org
- mirror-isc.debian.org
debug_mirror_onion:
- klecker.debian.org
@@
-260,6
+283,8
@@
roles:
- manziarly.debian.org
- milanollo.debian.org
- mirror-anu.debian.org
- manziarly.debian.org
- milanollo.debian.org
- mirror-anu.debian.org
+ - mirror-bytemark.debian.org
+ - mirror-conova.debian.org
- mirror-csail.debian.org
- mirror-isc.debian.org
- mirror-umn.debian.org
- mirror-csail.debian.org
- mirror-isc.debian.org
- mirror-umn.debian.org
@@
-276,7
+301,22
@@
roles:
- villa.debian.org
- wieck.debian.org
bgp:
- villa.debian.org
- wieck.debian.org
bgp:
- -
bilbao
.debian.org
+ -
mirror-bytemark
.debian.org
- mirror-conova.debian.org
- mirror-conova.debian.org
+ - mirror-accumu.debian.org
cdimage-search:
- cgi-grnet-01.debian.org
cdimage-search:
- cgi-grnet-01.debian.org
+ apache_prefork:
+ # php needs this
+ - quantz.debian.org
+ - tchaikovsky.debian.org
+ - wuiet.debian.org
+ postgresql_server:
+ - bmdb1.debian.org
+ - buxtehude.debian.org
+ - danzi.debian.org
+ - fasolo.debian.org
+ - melartin.debian.org
+ - seger.debian.org
+ - sibelius.debian.org
+ - vittoria.debian.org