From 562a5017ec445c5a1fbf163b9d5a10667a9f17ea Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 22:58:38 +0200 Subject: [PATCH] security_mirror -> hiera role; part 1 --- data/nodes/lobos.debian.org.yaml | 3 +++ data/nodes/mirror-accumu.debian.org.yaml | 1 + data/nodes/mirror-anu.debian.org.yaml | 1 + data/nodes/mirror-csail.debian.org.yaml | 1 + data/nodes/mirror-isc.debian.org.yaml | 1 + data/nodes/mirror-skroutz.debian.org.yaml | 1 + data/nodes/mirror-umn.debian.org.yaml | 1 + data/nodes/santoro.debian.org.yaml | 1 + data/nodes/schmelzer.debian.org.yaml | 1 + data/nodes/schumann.debian.org.yaml | 3 +++ data/nodes/sechter.debian.org.yaml | 3 +++ data/nodes/setoguchi.debian.org.yaml | 3 +++ data/nodes/villa.debian.org.yaml | 3 +++ data/nodes/wieck.debian.org.yaml | 3 +++ modules/roles/manifests/init.pp | 4 ---- 15 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 data/nodes/lobos.debian.org.yaml create mode 100644 data/nodes/schumann.debian.org.yaml create mode 100644 data/nodes/sechter.debian.org.yaml create mode 100644 data/nodes/setoguchi.debian.org.yaml create mode 100644 data/nodes/villa.debian.org.yaml create mode 100644 data/nodes/wieck.debian.org.yaml diff --git a/data/nodes/lobos.debian.org.yaml b/data/nodes/lobos.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/lobos.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/data/nodes/mirror-accumu.debian.org.yaml b/data/nodes/mirror-accumu.debian.org.yaml index 959e6eefe..1cf2fa067 100644 --- a/data/nodes/mirror-accumu.debian.org.yaml +++ b/data/nodes/mirror-accumu.debian.org.yaml @@ -3,6 +3,7 @@ classes: - roles::bgp - roles::debian_mirror - roles::debug_mirror + - roles::security_mirror roles::bgp::peers: ['2001:6b0:1e:2::1c6/128', '130.242.6.198/32'] roles::debian_mirror::listen_addr: ['130.242.6.199', '2001:6b0:1e:2::1c7', '193.31.7.2', '2a02:158:ffff:deb::2'] diff --git a/data/nodes/mirror-anu.debian.org.yaml b/data/nodes/mirror-anu.debian.org.yaml index 837125530..02f0648f1 100644 --- a/data/nodes/mirror-anu.debian.org.yaml +++ b/data/nodes/mirror-anu.debian.org.yaml @@ -1,4 +1,5 @@ classes: + - roles::security_mirror - roles::static_mirror_web - roles::syncproxy diff --git a/data/nodes/mirror-csail.debian.org.yaml b/data/nodes/mirror-csail.debian.org.yaml index 1a18dd42a..03974ece8 100644 --- a/data/nodes/mirror-csail.debian.org.yaml +++ b/data/nodes/mirror-csail.debian.org.yaml @@ -1,2 +1,3 @@ classes: + - roles::security_mirror - roles::static_mirror_web diff --git a/data/nodes/mirror-isc.debian.org.yaml b/data/nodes/mirror-isc.debian.org.yaml index 2de09ca25..cd3beca91 100644 --- a/data/nodes/mirror-isc.debian.org.yaml +++ b/data/nodes/mirror-isc.debian.org.yaml @@ -2,6 +2,7 @@ classes: - roles::debian_mirror - roles::ports_mirror + - roles::security_mirror - roles::static_mirror_web - roles::syncproxy diff --git a/data/nodes/mirror-skroutz.debian.org.yaml b/data/nodes/mirror-skroutz.debian.org.yaml index b62d707a5..f6cedad5b 100644 --- a/data/nodes/mirror-skroutz.debian.org.yaml +++ b/data/nodes/mirror-skroutz.debian.org.yaml @@ -2,6 +2,7 @@ classes: - roles::bgp - roles::debian_mirror + - roles::security_mirror roles::bgp::peers: ['2a03:e40:42:200::151:1/128', '2a03:e40:42:200::151:2/128', '154.57.0.249/32', '154.57.0.250/32'] roles::debian_mirror::listen_addr: ['154.57.0.251', '2a03:e40:42:200::151:3', '193.31.7.2', '2a02:158:ffff:deb::2'] diff --git a/data/nodes/mirror-umn.debian.org.yaml b/data/nodes/mirror-umn.debian.org.yaml index f65560b42..bca495b33 100644 --- a/data/nodes/mirror-umn.debian.org.yaml +++ b/data/nodes/mirror-umn.debian.org.yaml @@ -1,5 +1,6 @@ --- classes: + - roles::security_mirror - roles::syncproxy roles::syncproxy::syncproxy_name: syncproxy.cna.debian.org diff --git a/data/nodes/santoro.debian.org.yaml b/data/nodes/santoro.debian.org.yaml index 1a18dd42a..03974ece8 100644 --- a/data/nodes/santoro.debian.org.yaml +++ b/data/nodes/santoro.debian.org.yaml @@ -1,2 +1,3 @@ classes: + - roles::security_mirror - roles::static_mirror_web diff --git a/data/nodes/schmelzer.debian.org.yaml b/data/nodes/schmelzer.debian.org.yaml index 4740e41e0..3a9537a37 100644 --- a/data/nodes/schmelzer.debian.org.yaml +++ b/data/nodes/schmelzer.debian.org.yaml @@ -3,6 +3,7 @@ classes: - roles::debian_mirror - roles::debug_mirror - roles::historical_mirror + - roles::security_mirror - roles::syncproxy roles::debian_mirror::listen_addr: ['217.196.149.232', '2a02:16a8:dc41:100::232'] diff --git a/data/nodes/schumann.debian.org.yaml b/data/nodes/schumann.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/schumann.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/data/nodes/sechter.debian.org.yaml b/data/nodes/sechter.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/sechter.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/data/nodes/setoguchi.debian.org.yaml b/data/nodes/setoguchi.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/setoguchi.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/data/nodes/villa.debian.org.yaml b/data/nodes/villa.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/villa.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/data/nodes/wieck.debian.org.yaml b/data/nodes/wieck.debian.org.yaml new file mode 100644 index 000000000..854f0ec97 --- /dev/null +++ b/data/nodes/wieck.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::security_mirror diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 29416e822..9e5e649eb 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -1,10 +1,6 @@ # = Class: roles # class roles { - if has_role('security_mirror') { - include roles::security_mirror - } - if has_role('postgres_backup_server') { include postgres::backup_server } -- 2.20.1