From a05c0b8963134aba96825f5e1b780c0dfb36e5da Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO <ynerant@crans.org> Date: Mon, 4 Apr 2022 17:55:40 +0200 Subject: [PATCH 1/5] [all.yml] Update all.yml Signed-off-by: Yohann D'ANELLO <ynerant@crans.org> --- all.yml | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/all.yml b/all.yml index 692f4f0d..8ac059a9 100755 --- a/all.yml +++ b/all.yml @@ -4,46 +4,66 @@ # It's a good tool for lazy administrators that just want to check that # current running configuration matches Ansible. -# Core playboot to have minimal configuration -- import_playbook: plays/root.yml - -# Common configuration -- import_playbook: plays/mail.yml -- import_playbook: plays/nfs.yml -# - import_playbook: plays/logs.yml TODO: rsyncd -- import_playbook: plays/backup.yml # import borgbackup_client/server.yml -# - import_playbook: plays/network-interfaces.yml TODO: check this paybook -- import_playbook: plays/monitoring.yml - -# Services that only apply to a subset of server +- import_playbook: plays/autoconfig.yml +- import_playbook: plays/backup.yml +- import_playbook: plays/baie.yml +- import_playbook: plays/belenios.yml +- import_playbook: plays/bird.yml +- import_playbook: plays/borgbackup_client.yml - import_playbook: plays/cas.yml - import_playbook: plays/certbot.yml +- import_playbook: plays/constellation.yml - import_playbook: plays/dhcp.yml -- import_playbook: plays/dns.yml +- import_playbook: plays/dns-authoritative.yml +- import_playbook: plays/dns-recursive.yml - import_playbook: plays/dovecot.yml - import_playbook: plays/ethercalc.yml - import_playbook: plays/etherpad.yml - import_playbook: plays/firewall.yml - import_playbook: plays/framadate.yml - import_playbook: plays/freeradius.yml +- import_playbook: plays/galene.yml - import_playbook: plays/generate_documentation.yml - import_playbook: plays/gitlab.yml - import_playbook: plays/home.yml - import_playbook: plays/horde.yml +- import_playbook: plays/irc.yml +- import_playbook: plays/jitsi.yml - import_playbook: plays/keepalived.yml +- import_playbook: plays/linx.yml +- import_playbook: plays/logos.yml - import_playbook: plays/mailman.yml +- import_playbook: plays/matrix.yml - import_playbook: plays/mirror.yml - import_playbook: plays/moinmoin.yml -- import_playbook: plays/nginx_rtmp.yml +- import_playbook: plays/monitoring.yml +- import_playbook: plays/network_interfaces.yml +- import_playbook: plays/nfs_mount.yml +- import_playbook: plays/nginx.yml - import_playbook: plays/ntp.yml +- import_playbook: plays/nullmailer.yml - import_playbook: plays/owncloud.yml - import_playbook: plays/postfix.yml - import_playbook: plays/postgresql.yml +- import_playbook: plays/prefix-delegation.yml +- import_playbook: plays/printer.yml +- import_playbook: plays/proxmox.yml +- import_playbook: plays/radvd.yml +- import_playbook: plays/re2o-ldap.yml - import_playbook: plays/re2o.yml - import_playbook: plays/reverse-proxy.yml +- import_playbook: plays/root.yml - import_playbook: plays/roundcube.yml +- import_playbook: plays/routeurs.yml +- import_playbook: plays/rsyslog-server.yml +- import_playbook: plays/scripts.yml +- import_playbook: plays/slapd.yml - import_playbook: plays/ssh_known_hosts.yml -- import_playbook: plays/tv.yml +- import_playbook: plays/sssd.yml +- import_playbook: plays/unbound.yml - import_playbook: plays/unifi.yml +- import_playbook: plays/utilities.yml +- import_playbook: plays/vm_setup.yml +- import_playbook: plays/vsftpd.yml - import_playbook: plays/wireguard.yml - import_playbook: plays/zamok.yml -- GitLab From 5d16cd9c2fd6e5cae28afb48c704e343e9b6576d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO <ynerant@crans.org> Date: Mon, 4 Apr 2022 17:58:45 +0200 Subject: [PATCH 2/5] Drop Unifi Signed-off-by: Yohann D'ANELLO <ynerant@crans.org> --- all.yml | 1 - plays/unifi.yml | 6 ------ 2 files changed, 7 deletions(-) delete mode 100755 plays/unifi.yml diff --git a/all.yml b/all.yml index 8ac059a9..c7bb4fc4 100755 --- a/all.yml +++ b/all.yml @@ -61,7 +61,6 @@ - import_playbook: plays/ssh_known_hosts.yml - import_playbook: plays/sssd.yml - import_playbook: plays/unbound.yml -- import_playbook: plays/unifi.yml - import_playbook: plays/utilities.yml - import_playbook: plays/vm_setup.yml - import_playbook: plays/vsftpd.yml diff --git a/plays/unifi.yml b/plays/unifi.yml deleted file mode 100755 index f2ecdd83..00000000 --- a/plays/unifi.yml +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- -# Deploy Unifi Controller -- hosts: unifi - roles: - - unifi-controller -- GitLab From 4c721ee90f796e972c2c4e7e1accac1e7b97e14f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO <ynerant@crans.org> Date: Mon, 4 Apr 2022 17:58:55 +0200 Subject: [PATCH 3/5] [slapd] Fix re2o-ldap Signed-off-by: Yohann D'ANELLO <ynerant@crans.org> --- plays/slapd.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plays/slapd.yml b/plays/slapd.yml index db5fb3b5..95533606 100755 --- a/plays/slapd.yml +++ b/plays/slapd.yml @@ -6,8 +6,4 @@ roles: - slapd -- hosts: re2o_ldap_replica - vars: - re2o_ldap_replica: '{{ glob_re2o_ldap_replica | default({}) | combine(loc_re2o_ldap_replica | default({})) }}' - roles: - - re2o-ldap-replica +- import_playbook: re2o-ldap.yml -- GitLab From 7a84e373b78d4e1d70c4b680a9f45fc4270f1b53 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO <ynerant@crans.org> Date: Mon, 4 Apr 2022 17:59:38 +0200 Subject: [PATCH 4/5] We don't have any radius anymore Signed-off-by: Yohann D'ANELLO <ynerant@crans.org> --- hosts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hosts b/hosts index 36241bd6..e5d3aa92 100644 --- a/hosts +++ b/hosts @@ -37,7 +37,6 @@ gitlab jitsi mailman postfix -radius # We use certbot to manage LE certificates reverseproxy vsftpd_mirror @@ -188,9 +187,6 @@ routeurs_vm [re2o] re2o.adm.crans.org -[re2o:children] -radius - [re2o_front] re2o.adm.crans.org -- GitLab From 40d5e3a11a949830ad2650373591d1364e6f4458 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO <ynerant@crans.org> Date: Mon, 4 Apr 2022 18:00:47 +0200 Subject: [PATCH 5/5] [bind9] Fix tasks import Signed-off-by: Yohann D'ANELLO <ynerant@crans.org> --- roles/bind-authoritative/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bind-authoritative/tasks/main.yml b/roles/bind-authoritative/tasks/main.yml index 1191b44c..1c6daf7f 100644 --- a/roles/bind-authoritative/tasks/main.yml +++ b/roles/bind-authoritative/tasks/main.yml @@ -25,7 +25,7 @@ - named.conf.options notify: Reload Bind9 -- include: dnssec.yml +- include_tasks: dnssec.yml when: is_master - name: Indicate role in motd -- GitLab