X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=2e4b0e6102af6ada5f3768a88ab461fd6303181d;hb=05d85da88ba1a535370935ef64ada618185f2bbd;hp=d62a933bdf8ade3ef39959255213e858fb076668;hpb=d891d2ddc4c8447648be4efe3ad335e0ea5c492d;p=mirror%2Fdsa-puppet.git diff --git a/hieradata/common.yaml b/hieradata/common.yaml index d62a933bd..2e4b0e610 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/' @@ -18,22 +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 - contributors: - - nono.debian.org - dbmaster: - - draghi.debian.org - debtags: - - tate.debian.org dns_primary: - denis.debian.org dns_geo: @@ -44,39 +45,19 @@ roles: - denis.debian.org ftp_master: - fasolo.debian.org - ftp.upload.d.o: - - coccia.debian.org - - usper.debian.org - api.ftp-master: - - coccia.debian.org - dgit_browse: - - cgi-grnet-01.debian.org - dgit_git: - - cgi-grnet-01.debian.org git_master: - 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 - manpages-dyn: - - manziarly.debian.org - - cgi-grnet-01.debian.org mirrormaster: - melartin.debian.org muninmaster: - menotti.debian.org nagiosmaster: - tchaikovsky.debian.org - nm: - - nono.debian.org packages: - picconi.debian.org - pkgmirror-csail.debian.org @@ -84,31 +65,12 @@ roles: - picconi.debian.org packagesqamaster: - quantz.debian.org - people: - - 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: - - rainier.debian.org - - rapoport.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: @@ -167,42 +129,10 @@ roles: - ticharich.debian.org - wilder.debian.org - wuiet.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 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 - - casulana.debian.org - - coccia.debian.org - - dillon.debian.org - - donizetti.debian.org - - fasolo.debian.org - - kaufmann.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 @@ -212,43 +142,17 @@ roles: - 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: - wolkenstein.debian.org - cgi.d.o: - - wolkenstein.debian.org postgres_backup_server: - backuphost.debian.org - storace.debian.org - bacula_director: - - dinis.debian.org - bacula_storage: - - storace.debian.org dabackup_client: - 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: listen-addresses: @@ -292,12 +196,6 @@ roles: 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: @@ -306,10 +204,6 @@ roles: - tye.debian.org l10n.d.o: - tye.debian.org - dedup.d.n: - - delfin.debian.org - pet.d.n: - - petrova.debian.org ports_master: - porta.debian.org onionbalance: @@ -317,8 +211,6 @@ roles: bgp: - mirror-accumu.debian.org - mirror-skroutz.debian.org - cdimage-search: - - cgi-grnet-01.debian.org apache_prefork: # php needs this - quantz.debian.org @@ -334,25 +226,8 @@ roles: - 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_not_public: - # Hosts that run apache but where it should not be open to the internet by - # default - - casulana.debian.org apache_ratelimited: - beach.debian.org - buxtehude.debian.org @@ -360,17 +235,11 @@ roles: - picconi.debian.org - pkgmirror-csail.debian.org - sallinen.debian.org - cdbuilder_local_mirror: - - casulana.debian.org - alioth_archive: - - grabbe.debian.org snapshot_web: - lw07.debian.org - sallinen.debian.org snapshot_shell: - lw08.debian.org - anonscm: - - cgi-grnet-01.debian.org classes: - base::includes