From f250cf1719f00bdd246736e6cc0135bb71cdf992 Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Tue, 29 Dec 2020 18:33:39 +0100
Subject: [PATCH] Refactor hosts inventory

---
 all.yml        |   2 +-
 hosts          | 146 ++++++++++++++++++++++---------------------------
 plays/root.yml |   4 +-
 3 files changed, 68 insertions(+), 84 deletions(-)

diff --git a/all.yml b/all.yml
index 709ba117..399b5c40 100755
--- a/all.yml
+++ b/all.yml
@@ -6,7 +6,7 @@
 - import_playbook: plays/mail.yml
 - import_playbook: plays/nfs.yml
 #- import_playbook: plays/logs.yml
-#- import_playbook: plays/backup.yml
+- import_playbook: plays/backup.yml
 - import_playbook: plays/network-interfaces.yml
 - import_playbook: plays/monitoring.yml
 
diff --git a/hosts b/hosts
index ed6d9d84..2d2c70ad 100644
--- a/hosts
+++ b/hosts
@@ -1,70 +1,46 @@
 # Crans servers inventory
 
-# How to name your server ?
-# > We name servers according to location, then type.
-# > Then we regroup everything in global geographic and type groups.
-
-
-# [framadate]
-# voyager.adm.crans.org
-#
-# [dhcp]
-# dhcp.adm.crans.org
-# odlyd.adm.crans.org
-#
-# [keepalived]
-# gulp.adm.crans.org
-# odlyd.adm.crans.org
-# eap.adm.crans.org
-# radius.adm.crans.org
-# frontdaur.adm.crans.org
-# bakdaur.adm.crans.org
-#
-# [test_vm]
-# re2o-test.adm.crans.org
-[dovecot]
-owl.adm.crans.org
-
 [backups]
 zephir.adm.crans.org
 
-[certbot]
-gitzly.adm.crans.org
+[baie]
+cameron.adm.crans.org
+tealc.adm.crans.org
+
+[bdd]
+tealc.adm.crans.org
 
 [certbot:children]
+dovecot
+git
 radius  # We use certbot to manage LE certificates
 reverseproxy
-dovecot
-
-[nginx_rtmp]
-fluxx.adm.crans.org
 
-[reverseproxy]
-hodaur.adm.crans.org
+[dhcp]
+routeur-sam.adm.crans.org
+#routeur-daniel.adm.crans.org
 
-[roundcube]
-roundcube-srv.adm.crans.org
+[dovecot]
+owl.adm.crans.org
 
 [ethercalc]
 ethercalc-srv.adm.crans.org
 
+[framadate]
+voyager.adm.crans.org
+
+[git]
+gitzly.adm.crans.org
+
 [horde]
 horde.adm.crans.org
 
-[radius]
-routeur-sam.adm.crans.org
+[irc]
+irc.adm.crans.org
 
-[re2o]
-re2o-newinfra.adm.crans.org
+[keepalived]
 routeur-sam.adm.crans.org
-
-[bdd]
-tealc.adm.crans.org
-
-[virtu]
-sam.adm.crans.org
-daniel.adm.crans.org
-jack.adm.crans.org
+#routeur-daniel.adm.crans.org
 
 [ldap_server]
 tealc.adm.crans.org
@@ -72,55 +48,67 @@ sam.adm.crans.org
 daniel.adm.crans.org
 jack.adm.crans.org
 
-[keepalived]
+[nginx_rtmp]
+fluxx.adm.crans.org
+
+[radius]
 routeur-sam.adm.crans.org
-#routeur-daniel.adm.crans.org
 
-[dhcp]
+[re2o]
+re2o-newinfra.adm.crans.org
 routeur-sam.adm.crans.org
-#routeur-daniel.adm.crans.org
+
+[reverseproxy]
+hodaur.adm.crans.org
+
+[roundcube]
+roundcube-srv.adm.crans.org
+
+[virtu]
+sam.adm.crans.org
+daniel.adm.crans.org
+jack.adm.crans.org
 
 [crans_routeurs:children]
 dhcp
 keepalived
 
 [crans_physical]
-cameron.adm.crans.org
-tealc.adm.crans.org
-sam.adm.crans.org
-daniel.adm.crans.org
-jack.adm.crans.org
-#gulp.adm.crans.org
-zephir.adm.crans.org
+omnomnom.adm.crans.org
+
+[crans_physical:children]
+backups
+baie
+virtu
 
 [crans_vm]
-owl.adm.crans.org
-codichotomie.adm.crans.org
-voyager.adm.crans.org
-#silice.adm.crans.org
-routeur-sam.adm.crans.org
-#routeur-daniel.adm.crans.org
 #belenios.adm.crans.org
-#re2o-ldap.adm.crans.org
+bigbluebutton.adm.crans.org
+#boeing.adm.crans.org
+#casouley.adm.crans.org
+codichotomie.adm.crans.org
+#ethercalc-srv.adm.crans.org
+fluxx.adm.crans.org
 gitlab-ci.adm.crans.org
 gitzly.adm.crans.org
 hodaur.adm.crans.org
-monitoring.adm.crans.org
-#boeing.adm.crans.org
-fluxx.adm.crans.org
-#unifi.adm.crans.org
-#pastemoisa.adm.crans.org
-#casouley.adm.crans.org
-kiwi.adm.crans.org
-kiwijuice.adm.crans.org
-tracker.adm.crans.org
+horde.adm.crans.org
+irc.adm.crans.org
 jitsi.adm.crans.org
-#ethercalc-srv.adm.crans.org
 kenobi.adm.crans.org
-roundcube.adm.crans.org
-horde.adm.crans.org
-bigbluebutton.adm.crans.org
+kiwi.adm.crans.org
+kiwijuice.adm.crans.org
+monitoring.adm.crans.org
+owl.adm.crans.org
 owncloud.adm.crans.org
+#re2o-ldap.adm.crans.org
+roundcube.adm.crans.org
+#routeur-daniel.adm.crans.org
+routeur-sam.adm.crans.org
+#silice.adm.crans.org
+tracker.adm.crans.org
+voyager.adm.crans.org
+#unifi.adm.crans.org
 
 [ovh_physical]
 sputnik.adm.crans.org
@@ -129,7 +117,6 @@ sputnik.adm.crans.org
 [crans_server:children]
 crans_physical
 crans_vm
-crans_routeurs
 
 # everything at crans
 [crans:children]
@@ -147,7 +134,6 @@ ovh_physical
 # every virtual machine
 [vm:children]
 crans_vm
-crans_routeurs
 
 # every server
 [server:children]
diff --git a/plays/root.yml b/plays/root.yml
index a6b8f790..61f1da71 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -20,9 +20,7 @@
         insertafter: '127.0.0.1 localhost'
       when: check_mirror.found == 0
 
-
-
-- hosts: tealc.adm.crans.org
+- hosts: baie
   roles:
     - baie
 
-- 
GitLab