projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire unused ferm varible definitions for HOST_STATIC*
[mirror/dsa-puppet.git]
/
hieradata
/
common.yaml
diff --git
a/hieradata/common.yaml
b/hieradata/common.yaml
index
00c9c16
..
d701810
100644
(file)
--- 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/'
allow_dns_query: []
role_config__mirrors:
mirror_basedir_prefix: '/srv/mirrors/'
@@
-18,6
+25,10
@@
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'
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/'
+
+# all of these should be retired in favour of including the class role
+# with the host. weasel, 2019-09
roles:
bugsmx:
- buxtehude.debian.org
roles:
bugsmx:
- buxtehude.debian.org
@@
-28,8
+39,6
@@
roles:
bugs_base:
- buxtehude.debian.org
- beach.debian.org
bugs_base:
- buxtehude.debian.org
- beach.debian.org
- buildd_master:
- - wuiet.debian.org
contributors:
- nono.debian.org
dbmaster:
contributors:
- nono.debian.org
dbmaster:
@@
-59,8
+68,6
@@
roles:
- adayevskaya.debian.org
historicalpackages:
- hier.debian.org
- adayevskaya.debian.org
historicalpackages:
- hier.debian.org
- jenkins:
- - jerea.debian.org
keyring:
- kaufmann.debian.org
lists:
keyring:
- kaufmann.debian.org
lists:
@@
-98,8
+105,6
@@
roles:
pubsub:
- rainier.debian.org
- rapoport.debian.org
pubsub:
- rainier.debian.org
- rapoport.debian.org
- puppetmaster:
- - handel.debian.org
qamaster:
- quantz.debian.org
rtmaster:
qamaster:
- quantz.debian.org
rtmaster:
@@
-118,8
+123,6
@@
roles:
security_mirror:
mirror-anu.debian.org:
fastly-backend: false
security_mirror:
mirror-anu.debian.org:
fastly-backend: false
- mirror-conova.debian.org:
- fastly-backend: false
mirror-csail.debian.org:
fastly-backend: false
mirror-isc.debian.org:
mirror-csail.debian.org:
fastly-backend: false
mirror-isc.debian.org:
@@
-172,9
+175,11
@@
roles:
- tate.debian.org
- ticharich.debian.org
- wilder.debian.org
- tate.debian.org
- ticharich.debian.org
- wilder.debian.org
+ - wuiet.debian.org
static_master:
- dillon.debian.org
- fasolo.debian.org
static_master:
- dillon.debian.org
- fasolo.debian.org
+ - manziarly.debian.org
- porta.debian.org
- static-master-grnet-01.debian.org
static_mirror:
- porta.debian.org
- static-master-grnet-01.debian.org
static_mirror:
@@
-198,6
+203,7
@@
roles:
- dillon.debian.org
- donizetti.debian.org
- fasolo.debian.org
- dillon.debian.org
- donizetti.debian.org
- fasolo.debian.org
+ - kaufmann.debian.org
- lindsay.debian.org
- manziarly.debian.org
- mekeel.debian.org
- lindsay.debian.org
- manziarly.debian.org
- mekeel.debian.org
@@
-212,10
+218,10
@@
roles:
- klecker.debian.org
- milanollo.debian.org
- mirror-anu.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
- mirror-isc.debian.org
- mirror-umn.debian.org
- schmelzer.debian.org
+ - smit.debian.org
tracker:
- ticharich.debian.org
udd:
tracker:
- ticharich.debian.org
udd:
@@
-265,8
+271,6
@@
roles:
mirror-skroutz.debian.org:
service-hostname: skroutz.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:
- service-hostname: conova.debian.backend.mirrors.debian.org
mirror-isc.debian.org:
listen-addresses:
- '149.20.4.15:80'
mirror-isc.debian.org:
listen-addresses:
- '149.20.4.15:80'
@@
-283,12
+287,9
@@
roles:
historical_mirror:
- gretchaninov.debian.org
- klecker.debian.org
historical_mirror:
- gretchaninov.debian.org
- klecker.debian.org
- - mirror-conova.debian.org
- schmelzer.debian.org
- sibelius.debian.org
debug_mirror:
- schmelzer.debian.org
- sibelius.debian.org
debug_mirror:
- mirror-conova.debian.org:
- service-hostname: conova.debug.backend.mirrors.debian.org
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
@@
-300,7
+301,6
@@
roles:
service-hostname: conova.debug.backend.mirrors.debian.org
debug_mirror_onion:
- mirror-accumu.debian.org
service-hostname: conova.debug.backend.mirrors.debian.org
debug_mirror_onion:
- mirror-accumu.debian.org
- - mirror-conova.debian.org
- schmelzer.debian.org
ports_mirror:
- klecker.debian.org
- schmelzer.debian.org
ports_mirror:
- klecker.debian.org
@@
-325,7
+325,6
@@
roles:
onionbalance:
- olin.debian.org
bgp:
onionbalance:
- olin.debian.org
bgp:
- - mirror-conova.debian.org
- mirror-accumu.debian.org
- mirror-skroutz.debian.org
cdimage-search:
- mirror-accumu.debian.org
- mirror-skroutz.debian.org
cdimage-search:
@@
-341,10
+340,11
@@
roles:
- buxtehude.debian.org
- danzi.debian.org
- fasolo.debian.org
- buxtehude.debian.org
- danzi.debian.org
- fasolo.debian.org
+ - lw07.debian.org
- melartin.debian.org
- sallinen.debian.org
- seger.debian.org
- melartin.debian.org
- sallinen.debian.org
- seger.debian.org
- - s
ibelius
.debian.org
+ - s
napshotdb-manda-01
.debian.org
- vittoria.debian.org
salsa.debian.org:
- godard.debian.org
- vittoria.debian.org
salsa.debian.org:
- godard.debian.org
@@
-380,3
+380,6
@@
roles:
- lw08.debian.org
anonscm:
- cgi-grnet-01.debian.org
- lw08.debian.org
anonscm:
- cgi-grnet-01.debian.org
+
+classes:
+ - base::includes