X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=fb057a56355ba1cc9722f3661c2946deeab96424;hb=f29271d22a9f346a558cd70d2e6deb97c7900016;hp=6b13e5ede61551f157243104b815f125025067f0;hpb=e1640006ff8ed8f0224014d8866f97815c1ab541;p=mirror%2Fdsa-puppet.git diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 6b13e5ede..fb057a563 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -1,7 +1,14 @@ --- -nameservers: [] -searchpaths: [] -resolvoptions: [] + +lookup_options: + # with merge: unique entries in other hiera sources add to the array + resolv::searchpaths: + merge: unique + apt::sources::debian::location: + merge: unique + +resolv::nameservers: [] +resolv::searchpaths: ['debian.org'] allow_dns_query: [] role_config__mirrors: mirror_basedir_prefix: '/srv/mirrors/' @@ -11,7 +18,6 @@ samhain_recipients: - 'debian-archive-debian-samhain-reports@master.debian.org' - 'debian-admin@ftbfs.de' - 'weasel@debian.org' - - 'steve@lobefin.net' - 'zumbi@oron.es' root_mail_alias: - 'debian-admin@debian.org' @@ -19,18 +25,16 @@ paths: letsencrypt_dir: '/srv/puppet.debian.org/from-letsencrypt' auto_certs_dir: '/srv/puppet.debian.org/ca/RESULT/certs' auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts' +apt::sources::debian::location: 'https://deb.debian.org/debian/' + +staticsync::user: 'staticsync' +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: bugsmx: - buxtehude.debian.org - bugs_master: - - buxtehude.debian.org - bugs_mirror: - - beach.debian.org - bugs_base: - - buxtehude.debian.org - - beach.debian.org - buildd_master: - - wuiet.debian.org contributors: - nono.debian.org dbmaster: @@ -45,9 +49,6 @@ roles: - geo3.debian.org extranrpeclient: - denis.debian.org - ftp.d.o: - # also see debian_mirror - - klecker.debian.org ftp_master: - fasolo.debian.org ftp.upload.d.o: @@ -63,12 +64,6 @@ roles: - adayevskaya.debian.org historicalpackages: - hier.debian.org - jenkins: - - jerea.debian.org - keyring: - - kaufmann.debian.org - lists: - - bendel.debian.org mailrelay: - mailly.debian.org - muffat.debian.org @@ -102,43 +97,51 @@ roles: pubsub: - rainier.debian.org - rapoport.debian.org - puppetmaster: - - handel.debian.org qamaster: - quantz.debian.org rtmaster: - reger.debian.org - rtc: - - vogler.debian.org search_backend: - 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 - - mirror-bytemark.debian.org - - mirror-conova.debian.org - - mirror-csail.debian.org - - mirror-isc.debian.org - - mirror-umn.debian.org - - mirror-accumu.debian.org - - mirror-skroutz.debian.org - - lobos.debian.org - - santoro.debian.org - - setoguchi.debian.org - - sechter.debian.org - - villa.debian.org - - wieck.debian.org - security_mirror_onion: - - mirror-isc.debian.org - - mirror-umn.debian.org - - lobos.debian.org - - villa.debian.org + mirror-anu.debian.org: + fastly-backend: false + mirror-csail.debian.org: + fastly-backend: false + mirror-isc.debian.org: + onion_v4_address: 149.20.4.14 + mirror-umn.debian.org: + onion_v4_address: 128.101.240.215 + mirror-accumu.debian.org: + fastly-backend: false + mirror-skroutz.debian.org: + fastly-backend: false + lobos.debian.org: + service-hostname: lobos.security.backend.mirrors.debian.org + fastly-backend: false + onion_v4_address: 212.211.132.250 + santoro.debian.org: + fastly-backend: false + schmelzer.debian.org: + fastly-backend: false + schumann.debian.org: + service-hostname: schumann.security.backend.mirrors.debian.org + fastly-backend: true + setoguchi.debian.org: + fastly-backend: false + sechter.debian.org: + fastly-backend: false + villa.debian.org: + service-hostname: villa.security.backend.mirrors.debian.org + fastly-backend: true + onion_v4_address: 212.211.132.32 + wieck.debian.org: + service-hostname: wieck.security.backend.mirrors.debian.org + fastly-backend: true security_tracker: - soriano.debian.org security_upload: @@ -159,64 +162,26 @@ roles: - tate.debian.org - ticharich.debian.org - wilder.debian.org - static_master: - - dillon.debian.org - - fasolo.debian.org - - porta.debian.org - - static-master-grnet-01.debian.org - static_mirror: - - klecker.debian.org - - mirror-anu.debian.org - - mirror-csail.debian.org - - mirror-isc.debian.org - - senfter.debian.org - - santoro.debian.org + - wuiet.debian.org static_mirror_onion: - klecker.debian.org - mirror-isc.debian.org - senfter.debian.org - # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it. For this, also add it to static_mirror_nopush. - static_mirror_nopush: - - dummy - static_source: - - boott.debian.org - - coccia.debian.org - - dillon.debian.org - - donizetti.debian.org - - fasolo.debian.org - - lindsay.debian.org - - manziarly.debian.org - - mekeel.debian.org - - melartin.debian.org - - porta.debian.org - - philp.debian.org - - respighi.debian.org - - wolkenstein.debian.org - - wuiet.debian.org syncproxy: - gretchaninov.debian.org - klecker.debian.org - milanollo.debian.org - mirror-anu.debian.org - - mirror-conova.debian.org - mirror-isc.debian.org - mirror-umn.debian.org + - schmelzer.debian.org + - smit.debian.org tracker: - ticharich.debian.org udd: - ullmann.debian.org vote: - vento.debian.org - weblog_destination: - - wolkenstein.debian.org - weblog_provider: - - klecker.debian.org - - mirror-anu.debian.org - - mirror-csail.debian.org - - mirror-isc.debian.org - - mirror-umn.debian.org - - santoro.debian.org - - senfter.debian.org wiki: - wilder.debian.org www_master: @@ -231,48 +196,52 @@ roles: bacula_storage: - storace.debian.org dabackup_client: - - moszumanska.debian.org - lw03.debian.org gobby_debian_org: - gombert.debian.org - veyepar.debian.org: - - vittoria.debian.org - sreview.debian.org: - - vittoria.debian.org debian_mirror: - - klecker.debian.org - - mirror-bytemark.debian.org: - service-hostname: bytemark.debian.backend.mirrors.debian.org - listen-addresses: - - '5.153.231.45:80' - - '[2001:41c8:1000:21::21:45]:80' - fastly-backend: true - - mirror-accumu.debian.org: - service-hostname: accumu.debian.backend.mirrors.debian.org - fastly-backend: true - - mirror-skroutz.debian.org: - service-hostname: skroutz.debian.backend.mirrors.debian.org - fastly-backend: true - - mirror-conova.debian.org - - mirror-isc.debian.org - debian_mirror_onion: - - klecker.debian.org - - mirror-bytemark.debian.org - - mirror-isc.debian.org + klecker.debian.org: + listen-addresses: + - '130.89.148.12:80' + - '[2001:67c:2564:a119::148:12]:80' + onion_v4_address: 130.89.148.12 + mirror-accumu.debian.org: + service-hostname: accumu.debian.backend.mirrors.debian.org + fastly-backend: true + mirror-skroutz.debian.org: + service-hostname: skroutz.debian.backend.mirrors.debian.org + fastly-backend: true + mirror-isc.debian.org: + listen-addresses: + - '149.20.4.15:80' + - '[2001:4f8:1:c::15]:80' + onion_v4_address: 149.20.4.15 + schmelzer.debian.org: + listen-addresses: + - '217.196.149.232:80' + - '[2a02:16a8:dc41:100::232]:80' + fastly-backend: true + service-hostname: conova.debian.backend.mirrors.debian.org historical_master: - sibelius.debian.org historical_mirror: - gretchaninov.debian.org - klecker.debian.org - - mirror-conova.debian.org + - schmelzer.debian.org - sibelius.debian.org debug_mirror: - - klecker.debian.org - - mirror-conova.debian.org - - mirror-isc.debian.org + mirror-accumu.debian.org: + onion_v4_address: 130.242.6.199 + service-hostname: accumu.debug.backend.mirrors.debian.org + schmelzer.debian.org: + listen-addresses: + - '217.196.149.232:80' + - '[2a02:16a8:dc41:100::232]:80' + onion_v4_address: 217.196.149.232 + service-hostname: conova.debug.backend.mirrors.debian.org debug_mirror_onion: - - klecker.debian.org - - mirror-isc.debian.org + - mirror-accumu.debian.org + - schmelzer.debian.org ports_mirror: - klecker.debian.org - mirror-isc.debian.org @@ -295,13 +264,7 @@ roles: - porta.debian.org onionbalance: - olin.debian.org - experimental_apache: - - cgi-grnet-01.debian.org - - pejacevic.debian.org - - petrova.debian.org bgp: - - mirror-bytemark.debian.org - - mirror-conova.debian.org - mirror-accumu.debian.org - mirror-skroutz.debian.org cdimage-search: @@ -317,20 +280,28 @@ roles: - buxtehude.debian.org - danzi.debian.org - fasolo.debian.org + - lw07.debian.org - melartin.debian.org - sallinen.debian.org - seger.debian.org - - sibelius.debian.org + - snapshotdb-manda-01.debian.org - vittoria.debian.org - salsa.debian.org: - - godard.debian.org - insecure_ssl: - - debussy.debian.org - - godard.debian.org debsources: - sor.debian.org - ipsec: - - fasolo.debian.org - - storace.debian.org debconf_wafer: - debussy.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