From b1add6ce2c72a20a9a32f4dcae8540a139814854 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Sat, 8 Oct 2022 20:03:12 +0200 Subject: [PATCH] Re-organize host inventory --- bank.yaml | 1 - common.yaml | 4 ++++ group_vars/mqtt_internal.yaml | 1 + group_vars/music.yaml | 3 +++ hosts | 11 ----------- hosts.yaml | 25 +++++++++++++++++++++++++ mqtt-internal.yaml | 2 -- music.yaml | 4 ---- 8 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 common.yaml create mode 100644 group_vars/mqtt_internal.yaml create mode 100644 group_vars/music.yaml delete mode 100644 hosts create mode 100644 hosts.yaml diff --git a/bank.yaml b/bank.yaml index 7514be2..c77308d 100644 --- a/bank.yaml +++ b/bank.yaml @@ -1,6 +1,5 @@ --- - hosts: bank - vars: roles: - common - bank diff --git a/common.yaml b/common.yaml new file mode 100644 index 0000000..2f2247e --- /dev/null +++ b/common.yaml @@ -0,0 +1,4 @@ +--- +- hosts: debian + roles: + - common diff --git a/group_vars/mqtt_internal.yaml b/group_vars/mqtt_internal.yaml new file mode 100644 index 0000000..3ce5308 --- /dev/null +++ b/group_vars/mqtt_internal.yaml @@ -0,0 +1 @@ +mqtt_internal_public_host: bitlair.nl diff --git a/group_vars/music.yaml b/group_vars/music.yaml new file mode 100644 index 0000000..7106ebf --- /dev/null +++ b/group_vars/music.yaml @@ -0,0 +1,3 @@ +music_domain: music.bitlair.nl +acme_san_domains: + - [ music.bitlair.nl ] diff --git a/hosts b/hosts deleted file mode 100644 index 9a609b6..0000000 --- a/hosts +++ /dev/null @@ -1,11 +0,0 @@ -[bank] -bank.bitlair.nl - -[bar] -bank-pi.bitlair.nl - -[mqtt_internal] -mqtt.bitlair.nl - -[music] -music.bitlair.nl diff --git a/hosts.yaml b/hosts.yaml new file mode 100644 index 0000000..d3ebcdc --- /dev/null +++ b/hosts.yaml @@ -0,0 +1,25 @@ +all: + children: + raspi: + hosts: + bank-pi.bitlair.nl: + debian: + children: + bank: + hosts: + bank.bitlair.nl: + git: + hosts: + git.bitlair.nl: + lights: + hosts: + lights.bitlair.nl: + mqtt_internal: + hosts: + mqtt.bitlair.nl: + music: + hosts: + music.bitlair.nl: + www: + hosts: + cyber.bitlair.nl: diff --git a/mqtt-internal.yaml b/mqtt-internal.yaml index 102998a..20d0cb7 100644 --- a/mqtt-internal.yaml +++ b/mqtt-internal.yaml @@ -1,7 +1,5 @@ --- - hosts: mqtt_internal - vars: - mqtt_internal_public_host: bitlair.nl roles: - common - mqtt-internal diff --git a/music.yaml b/music.yaml index 919aa71..b6fe086 100644 --- a/music.yaml +++ b/music.yaml @@ -1,9 +1,5 @@ --- - hosts: music - vars: - music_domain: music.bitlair.nl - acme_san_domains: - - [ music.bitlair.nl ] roles: - common - acme