From 7d1b56fc2c15123f5a24bd9659a1d8b04e0976e8 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 19 Nov 2022 16:20:47 +0100 Subject: [PATCH] moved everything to FQDNs --- ...est01 => glustertest01.universe.local.yml} | 0 host_vars/glustertest02 | 1 - host_vars/glustertest02.universe.local.yml | 1 + host_vars/glustertest03 | 1 - host_vars/glustertest03.universe.local.yml | 1 + ...{mailcow.yml => mailcowuniverse.local.yml} | 0 ...mariadb01 => mariadb01.universe.local.yml} | 0 host_vars/mariadb02 | 1 - host_vars/mariadb02.universe.local.yml | 1 + host_vars/mariadb03 | 1 - host_vars/mariadb03.universe.local.yml | 1 + ...nextcloud => nextcloud.universe.local.yml} | 0 host_vars/{pve => pve.universe.local.yml} | 0 ...und01.yml => unbound01.universe.local.yml} | 0 host_vars/unbound02.universe.local.yml | 1 + host_vars/unbound02.yml | 1 - ...webserver => webserver.universe.local.yml} | 0 hosts | 86 +++++++++---------- 18 files changed, 48 insertions(+), 48 deletions(-) rename host_vars/{glustertest01 => glustertest01.universe.local.yml} (100%) delete mode 120000 host_vars/glustertest02 create mode 120000 host_vars/glustertest02.universe.local.yml delete mode 120000 host_vars/glustertest03 create mode 120000 host_vars/glustertest03.universe.local.yml rename host_vars/{mailcow.yml => mailcowuniverse.local.yml} (100%) rename host_vars/{mariadb01 => mariadb01.universe.local.yml} (100%) delete mode 120000 host_vars/mariadb02 create mode 120000 host_vars/mariadb02.universe.local.yml delete mode 120000 host_vars/mariadb03 create mode 120000 host_vars/mariadb03.universe.local.yml rename host_vars/{nextcloud => nextcloud.universe.local.yml} (100%) rename host_vars/{pve => pve.universe.local.yml} (100%) rename host_vars/{unbound01.yml => unbound01.universe.local.yml} (100%) create mode 120000 host_vars/unbound02.universe.local.yml delete mode 120000 host_vars/unbound02.yml rename host_vars/{webserver => webserver.universe.local.yml} (100%) diff --git a/host_vars/glustertest01 b/host_vars/glustertest01.universe.local.yml similarity index 100% rename from host_vars/glustertest01 rename to host_vars/glustertest01.universe.local.yml diff --git a/host_vars/glustertest02 b/host_vars/glustertest02 deleted file mode 120000 index 9683f9f..0000000 --- a/host_vars/glustertest02 +++ /dev/null @@ -1 +0,0 @@ -glustertest01 \ No newline at end of file diff --git a/host_vars/glustertest02.universe.local.yml b/host_vars/glustertest02.universe.local.yml new file mode 120000 index 0000000..b34fe42 --- /dev/null +++ b/host_vars/glustertest02.universe.local.yml @@ -0,0 +1 @@ +glustertest01.universe.local.yml \ No newline at end of file diff --git a/host_vars/glustertest03 b/host_vars/glustertest03 deleted file mode 120000 index 9683f9f..0000000 --- a/host_vars/glustertest03 +++ /dev/null @@ -1 +0,0 @@ -glustertest01 \ No newline at end of file diff --git a/host_vars/glustertest03.universe.local.yml b/host_vars/glustertest03.universe.local.yml new file mode 120000 index 0000000..b34fe42 --- /dev/null +++ b/host_vars/glustertest03.universe.local.yml @@ -0,0 +1 @@ +glustertest01.universe.local.yml \ No newline at end of file diff --git a/host_vars/mailcow.yml b/host_vars/mailcowuniverse.local.yml similarity index 100% rename from host_vars/mailcow.yml rename to host_vars/mailcowuniverse.local.yml diff --git a/host_vars/mariadb01 b/host_vars/mariadb01.universe.local.yml similarity index 100% rename from host_vars/mariadb01 rename to host_vars/mariadb01.universe.local.yml diff --git a/host_vars/mariadb02 b/host_vars/mariadb02 deleted file mode 120000 index de15b25..0000000 --- a/host_vars/mariadb02 +++ /dev/null @@ -1 +0,0 @@ -mariadb01 \ No newline at end of file diff --git a/host_vars/mariadb02.universe.local.yml b/host_vars/mariadb02.universe.local.yml new file mode 120000 index 0000000..5b8ac36 --- /dev/null +++ b/host_vars/mariadb02.universe.local.yml @@ -0,0 +1 @@ +mariadb01.universe.local.yml \ No newline at end of file diff --git a/host_vars/mariadb03 b/host_vars/mariadb03 deleted file mode 120000 index de15b25..0000000 --- a/host_vars/mariadb03 +++ /dev/null @@ -1 +0,0 @@ -mariadb01 \ No newline at end of file diff --git a/host_vars/mariadb03.universe.local.yml b/host_vars/mariadb03.universe.local.yml new file mode 120000 index 0000000..5b8ac36 --- /dev/null +++ b/host_vars/mariadb03.universe.local.yml @@ -0,0 +1 @@ +mariadb01.universe.local.yml \ No newline at end of file diff --git a/host_vars/nextcloud b/host_vars/nextcloud.universe.local.yml similarity index 100% rename from host_vars/nextcloud rename to host_vars/nextcloud.universe.local.yml diff --git a/host_vars/pve b/host_vars/pve.universe.local.yml similarity index 100% rename from host_vars/pve rename to host_vars/pve.universe.local.yml diff --git a/host_vars/unbound01.yml b/host_vars/unbound01.universe.local.yml similarity index 100% rename from host_vars/unbound01.yml rename to host_vars/unbound01.universe.local.yml diff --git a/host_vars/unbound02.universe.local.yml b/host_vars/unbound02.universe.local.yml new file mode 120000 index 0000000..b1ea95f --- /dev/null +++ b/host_vars/unbound02.universe.local.yml @@ -0,0 +1 @@ +unbound01.universe.local.yml \ No newline at end of file diff --git a/host_vars/unbound02.yml b/host_vars/unbound02.yml deleted file mode 120000 index bcd1b3b..0000000 --- a/host_vars/unbound02.yml +++ /dev/null @@ -1 +0,0 @@ -unbound01.yml \ No newline at end of file diff --git a/host_vars/webserver b/host_vars/webserver.universe.local.yml similarity index 100% rename from host_vars/webserver rename to host_vars/webserver.universe.local.yml diff --git a/hosts b/hosts index 31b6ce8..d5b6efa 100644 --- a/hosts +++ b/hosts @@ -1,39 +1,39 @@ [base] -VM-debian11-template +VM-debian11-template.universe.local [cluster:children] -glustertest +glustertest.universe.local [server] -pve -netbox -Samba-AD-DC -librenms -grafana -backup -haproxy01 -haproxy02 +pve.universe.local +netbox.universe.local +Samba-AD-DC.universe.local +librenms.universe.local +grafana.universe.local +backup.universe.local +haproxy01.universe.local +haproxy02.universe.local [server:children] -cluster -database -dhcpserver -docker -fileserver -icinga -jitsimeet -mailserver -mastodon -nameserver -printspooler -proxyserver -webserver +cluster.universe.local +database.universe.local +dhcpserver.universe.local +docker.universe.local +fileserver.universe.local +icinga.universe.local +jitsimeet.universe.local +mailserver.universe.local +mastodon.universe.local +nameserver.universe.local +printspooler.universe.local +proxyserver.universe.local +webserver.universe.local [database] coruscant.universe.local -mariadb01 -mariadb02 -mariadb03 +mariadb01.universe.local +mariadb02.universe.local +mariadb03.universe.local [development] endor.universe.local @@ -42,23 +42,23 @@ tuxedo-book-xp1511.universe.local [dhcpserver] coruscant.universe.local -dhcp-kea +dhcp-kea.universe.local [docker] -docker01 -docker02 +docker01.universe.local +docker02.universe.local [fileserver] coruscant.universe.local -samba-ad-dc +samba-ad-dc.universe.local [glustertest] -glustertest01 -glustertest02 -glustertest03 +glustertest01.universe.local +glustertest02.universe.local +glustertest03.universe.local [icinga_master] -icinga +icinga.universe.local [icinga_satellite] @@ -72,12 +72,12 @@ mewimeet.de jitsi_fqdn=mewimeet.de [mailserver] coruscant.universe.local mail.mewissen.site -mailcow +mailcow.universe.local mail.universe.local [mastodon] mewitoot.de -ubuntu-test +ubuntu-test.universe.local [mobile] tuxedo-book-xp1511.universe.local @@ -86,9 +86,9 @@ tuxedo-book-xp1511.universe.local coruscant.universe.local mewimeet.de mewitoot.de -ns1 -unbound01 -unbound02 +ns1.universe.local +unbound01.universe.local +unbound02.universe.local [photo_editing] endor.universe.local @@ -108,11 +108,11 @@ tuxedo-book-xp1511.universe.local [webserver] coruscant.universe.local -nextcloud -webserver +nextcloud.universe.local +webserver.universe.local [workstation:children] -development -mobile +development.universe.local +mobile.universe.local photo_editing video_editing