projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
migrate packagesmaster and packagesqamaster role
[mirror/dsa-puppet.git]
/
hieradata
/
common.yaml
diff --git
a/hieradata/common.yaml
b/hieradata/common.yaml
index
ffaafe9
..
71b1519
100644
(file)
--- a/
hieradata/common.yaml
+++ b/
hieradata/common.yaml
@@
-33,56
+33,38
@@
staticsync::basedir: '/srv/static.debian.org'
# all of these should be retired in favour of including the class role
# with the host. weasel, 2019-09
roles:
# all of these should be retired in favour of including the class role
# with the host. weasel, 2019-09
roles:
- bugsmx:
- - buxtehude.debian.org
dns_primary:
dns_primary:
+ # XXX - used by ferm templates/defs.conf.erb
- denis.debian.org
dns_geo:
- denis.debian.org
dns_geo:
+ # XXX - used by ferm templates/defs.conf.erb
- geo1.debian.org
- geo2.debian.org
- geo3.debian.org
extranrpeclient:
- geo1.debian.org
- geo2.debian.org
- geo3.debian.org
extranrpeclient:
+ # XXX - used by ferm templates/defs.conf.erb
- denis.debian.org
ftp_master:
- denis.debian.org
ftp_master:
+ # XXX - used by ferm templates/defs.conf.erb
- fasolo.debian.org
- fasolo.debian.org
- ftp.upload.d.o:
- - coccia.debian.org
- - usper.debian.org
- git_master:
- - adayevskaya.debian.org
- historicalpackages:
- - hier.debian.org
mailrelay:
mailrelay:
+ # XXX - ONLY used by ferm templates/defs.conf.erb
- mailly.debian.org
- muffat.debian.org
- mailly.debian.org
- muffat.debian.org
- manpages-dyn:
- - manziarly.debian.org
- - cgi-grnet-01.debian.org
mirrormaster:
mirrormaster:
+ # XXX - used by ferm templates/defs.conf.erb
- melartin.debian.org
muninmaster:
- melartin.debian.org
muninmaster:
+ # XXX - used by ferm templates/defs.conf.erb
- menotti.debian.org
nagiosmaster:
- menotti.debian.org
nagiosmaster:
+ # XXX - used by ferm templates/defs.conf.erb
- tchaikovsky.debian.org
- tchaikovsky.debian.org
- packages:
- - picconi.debian.org
- - pkgmirror-csail.debian.org
- packagesmaster:
- - picconi.debian.org
- packagesqamaster:
- - quantz.debian.org
- popcon:
- - pinel.debian.org
- pubsub:
- - rainier.debian.org
- - rapoport.debian.org
- qamaster:
- - quantz.debian.org
- rtmaster:
- - reger.debian.org
security_master:
security_master:
+ # XXX - used by ferm templates/defs.conf.erb
- seger.debian.org
security_mirror:
- seger.debian.org
security_mirror:
+ # XXX used also in ferm me.conf.erb
mirror-anu.debian.org:
fastly-backend: false
mirror-csail.debian.org:
mirror-anu.debian.org:
fastly-backend: false
mirror-csail.debian.org:
@@
-117,32
+99,8
@@
roles:
wieck.debian.org:
service-hostname: wieck.security.backend.mirrors.debian.org
fastly-backend: true
wieck.debian.org:
service-hostname: wieck.security.backend.mirrors.debian.org
fastly-backend: true
- security_tracker:
- - soriano.debian.org
- security_upload:
- - suchon.debian.org
- ssh.upload.d.o:
- - coccia.debian.org
- - suchon.debian.org
- - usper.debian.org
- sso:
- - diabelli.debian.org
- # single sign on relying party (host) - also required apache2 module enabled on that host via other means
- sso_rp:
- - debussy.debian.org
- - diabelli.debian.org
- - jerea.debian.org
- - nono.debian.org
- - quantz.debian.org
- - tate.debian.org
- - ticharich.debian.org
- - wilder.debian.org
- - wuiet.debian.org
- static_mirror_onion:
- - klecker.debian.org
- - mirror-isc.debian.org
- - senfter.debian.org
syncproxy:
syncproxy:
+ # XXX - used by ferm templates/defs.conf.erb
- gretchaninov.debian.org
- klecker.debian.org
- milanollo.debian.org
- gretchaninov.debian.org
- klecker.debian.org
- milanollo.debian.org
@@
-151,26
+109,14
@@
roles:
- mirror-umn.debian.org
- schmelzer.debian.org
- smit.debian.org
- mirror-umn.debian.org
- schmelzer.debian.org
- smit.debian.org
- udd:
- - ullmann.debian.org
- wiki:
- - wilder.debian.org
- www_master:
- - wolkenstein.debian.org
- cgi.d.o:
- - wolkenstein.debian.org
postgres_backup_server:
postgres_backup_server:
+ # XXX - used by ferm templates/defs.conf.erb
- backuphost.debian.org
- storace.debian.org
- backuphost.debian.org
- storace.debian.org
- bacula_director:
- - dinis.debian.org
- bacula_storage:
- - storace.debian.org
dabackup_client:
- lw03.debian.org
dabackup_client:
- lw03.debian.org
- gobby_debian_org:
- - gombert.debian.org
debian_mirror:
debian_mirror:
+ # XXX used also in ferm me.conf.erb
klecker.debian.org:
listen-addresses:
- '130.89.148.12:80'
klecker.debian.org:
listen-addresses:
- '130.89.148.12:80'
@@
-194,13
+140,16
@@
roles:
fastly-backend: true
service-hostname: conova.debian.backend.mirrors.debian.org
historical_master:
fastly-backend: true
service-hostname: conova.debian.backend.mirrors.debian.org
historical_master:
+ # XXX - used by ferm templates/defs.conf.erb
- sibelius.debian.org
historical_mirror:
- sibelius.debian.org
historical_mirror:
+ # XXX used also in ferm me.conf.erb
- gretchaninov.debian.org
- klecker.debian.org
- schmelzer.debian.org
- sibelius.debian.org
debug_mirror:
- gretchaninov.debian.org
- klecker.debian.org
- schmelzer.debian.org
- sibelius.debian.org
debug_mirror:
+ # XXX used also in ferm me.conf.erb
mirror-accumu.debian.org:
onion_v4_address: 130.242.6.199
service-hostname: accumu.debug.backend.mirrors.debian.org
mirror-accumu.debian.org:
onion_v4_address: 130.242.6.199
service-hostname: accumu.debug.backend.mirrors.debian.org
@@
-213,36
+162,14
@@
roles:
debug_mirror_onion:
- mirror-accumu.debian.org
- schmelzer.debian.org
debug_mirror_onion:
- mirror-accumu.debian.org
- schmelzer.debian.org
- ports_mirror:
- - klecker.debian.org
- - mirror-isc.debian.org
- ports_mirror_onion:
- - klecker.debian.org
- - mirror-isc.debian.org
- planet_master:
- - philp.debian.org
- planet_search:
- - philp.debian.org
- i18n.d.o:
- - tye.debian.org
- l10n.d.o:
- - tye.debian.org
- pet.d.n:
- - petrova.debian.org
ports_master:
ports_master:
+ # XXX - used by ferm templates/defs.conf.erb
- porta.debian.org
onionbalance:
- olin.debian.org
bgp:
- mirror-accumu.debian.org
- mirror-skroutz.debian.org
- porta.debian.org
onionbalance:
- olin.debian.org
bgp:
- mirror-accumu.debian.org
- mirror-skroutz.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:
# postgresql instances not managed by puppet otherwise
- bmdb1.debian.org
postgresql_server:
# postgresql instances not managed by puppet otherwise
- bmdb1.debian.org
@@
-255,20
+182,6
@@
roles:
- seger.debian.org
- snapshotdb-manda-01.debian.org
- vittoria.debian.org
- seger.debian.org
- snapshotdb-manda-01.debian.org
- vittoria.debian.org
- debsources:
- - sor.debian.org
- apache_ratelimited:
- - beach.debian.org
- - buxtehude.debian.org
- - lw07.debian.org
- - picconi.debian.org
- - pkgmirror-csail.debian.org
- - sallinen.debian.org
- snapshot_web:
- - lw07.debian.org
- - sallinen.debian.org
- snapshot_shell:
- - lw08.debian.org
classes:
- base::includes
classes:
- base::includes