Remove base.yml and fix all.yml

all.yml

@@ -3,59 +3,8 @@
 # Set variable adm_iface for all servers
 - import_playbook: plays/get_adm_iface.yml
 
-# Common CRANS configuration for all servers
-- hosts: server
-  vars:
-    # Debian mirror on adm
-    debian_mirror: http://mirror.adm.crans.org/debian
-    debian_components: main non-free
-
-    # LDAP binding
-    ldap_base: 'dc=crans,dc=org'
-    ldap_master_ipv4: '10.231.136.19'
-    ldap_local_replica_uri:
-      - "ldap://10.231.136.38"
-      - "ldap://10.231.136.4"
-    ldap_master_uri: "ldap://{{ ldap_master_ipv4 }}"
-    ldap_user_tree: "cn=Utilisateurs,{{ ldap_base }}"
-    ldap_nslcd_bind_dn: "cn=nslcd,ou=service-users,{{ ldap_base }}"
-    ldap_nslcd_passwd: "{{ vault_ldap_nslcd_passwd }}"
-
-    # Group permissions
-    ssh_allow_groups: ssh nounou apprenti cableur root
-
-    # Scripts will tell users to go there to manage their account
-    intranet_url: 'https://intranet.crans.org/'
-
-    # Will be in /usr/scripts/
-    crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
-
-    # NTP servers
-    ntp_servers:
-      - charybde.adm.crans.org
-      - silice.adm.crans.org
-  roles:
-    - common-tools
-    - debian-apt-sources
-    - ldap-client
-    - openssh
-    - sudo
-    - ntp-client
-    - crans-scripts
-    - root-config
-
-# Deploy LDAP replica
-- hosts: odlyd.adm.crans.org,soyouz.adm.crans.org,fy.adm.crans.org,thot.adm.crans.org
-  roles: []  # TODO
-
-- hosts: otis.adm.crans.org
-  roles:
-    - ansible
-
-# Tools for members
-- hosts: zamok.adm.crans.org
-  roles:
-    - zamok-tools
+# Core playboot to have minimal configuration
+- import_playbook: plays/root.yml
 
 - import_playbook: plays/mail.yml
 - import_playbook: plays/nfs.yml
@@ -65,13 +14,34 @@
 - import_playbook: plays/monitoring.yml
 
 # Services that only apply to a subset of server
-- import_playbook: plays/tv.yml
-- import_playbook: plays/mailman.yml
 - import_playbook: plays/dhcp.yml
 - import_playbook: plays/dns.yml
-- import_playbook: plays/wireguard.yml
-- import_playbook: plays/mirror.yml
-- import_playbook: plays/owncloud.yml
 - import_playbook: plays/etherpad.yml
+- import_playbook: plays/firewall.yml
+- import_playbook: plays/framadate.yml
+- import_playbook: plays/freeradius.yml
+- import_playbook: plays/generate_documentation.yml
+- import_playbook: plays/gitlab.yml
+- import_playbook: plays/horde.yml
+- import_playbook: plays/keepalived.yml
+- import_playbook: plays/mailman.yml
+- import_playbook: plays/mirror.yml
+- import_playbook: plays/moinmoin.yml
+- import_playbook: plays/nginx_rtmp.yml
+- import_playbook: plays/owncloud.yml
+- import_playbook: plays/postgresql.yml
+- import_playbook: plays/re2o.yml
 - import_playbook: plays/reverse-proxy.yml
 - import_playbook: plays/roundcube.yml
+- import_playbook: plays/tv.yml
+- import_playbook: plays/wireguard.yml
+
+# FIXME: should be in plays/ directory
+# Tools for members
+- hosts: zamok.adm.crans.org
+  roles: ["zamok-tools"]
+
+# FIXME: should be in plays/ directory
+# Deploy LDAP replica
+- hosts: odlyd.adm.crans.org,soyouz.adm.crans.org,fy.adm.crans.org,thot.adm.crans.org
+  roles: []  # TODO

base.yml

@@ -1,41 +0,0 @@
-#!/usr/bin/env ansible-playbook
----
-# Set variable adm_iface for all servers
-# - hosts: server
-#   tasks:
-#     - name: Register adm interface in adm_iface variable
-#       shell: set -o pipefail && grep adm /sys/class/net/*/ifalias | sed "s|/sys/class/net/||" | sed "s|/ifalias:.*||"
-#       register: adm_iface
-#       check_mode: false
-#       changed_when: true
-#       args:
-#         executable: /bin/bash
-
-
-- hosts: otis.adm.crans.org
-  roles:
-    - ansible
-
-# Tools for members
-- hosts: zamok.adm.crans.org
-  roles:
-#     - zamok-tools
-
-# - import_playbook: plays/mail.yml
-- import_playbook: plays/nfs.yml
-# - import_playbook: plays/logs.yml
-# - import_playbook: plays/backup.yml
-# - import_playbook: plays/network-interfaces.yml
-# - import_playbook: plays/monitoring.yml
-# - import_playbook: plays/generate_documentation.yml
-
-# Services that only apply to a subset of server
-# - import_playbook: plays/tv.yml
-# - import_playbook: plays/mailman.yml
-# - import_playbook: plays/dhcp.yml
-# - import_playbook: plays/dns.yml
-# - import_playbook: plays/wireguard.yml
-# - import_playbook: plays/mirror.yml
-# - import_playbook: plays/owncloud.yml
-# - import_playbook: plays/reverse-proxy.yml
-- import_playbook: plays/gitlab.yml