diff --git a/group_vars/all/borg.yml b/group_vars/all/borg.yml
index c8d4790be12b37b5c14aa63f3203989498e9de75..991dcd24476bd12a05b1bdff3c8c84278cb91ae2 100644
--- a/group_vars/all/borg.yml
+++ b/group_vars/all/borg.yml
@@ -10,7 +10,6 @@ glob_borg:
- /backup/borg-adh
remote:
- ssh://borg@backup-ft.adm.crans.org/backup/borg-server/{{ ansible_hostname }}
-# - ssh://borg@backup-thot.adm.crans.org/backup/borg-server/{{ ansible_hostname }}
retention:
- ["daily", 4]
- ["monthly", 6]
diff --git a/host_vars/backup-thot.adm.crans.org.yml b/host_vars/backup-thot.adm.crans.org.yml
deleted file mode 100644
index 9d544042ea35899a780c6a5309fe4321e2828231..0000000000000000000000000000000000000000
--- a/host_vars/backup-thot.adm.crans.org.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-interfaces:
- adm: ens18
-
-loc_unattended:
- reboot: true
-
-loc_needrestart:
- override: []
-
-loc_home_nounou:
- mounts:
- - ip: "{{ lookup('ldap', 'ip4', 'thot', 'adm') }}"
- mountpoint: /home_nounou
- target: /home_nounou
- name: home_nounou
- owner: root
- group: _user
- mode: '0750'
- - ip: "{{ lookup('ldap', 'ip4', 'thot', 'adm') }}"
- mountpoint: /rpool/backup
- target: /backup
- name: backup
- owner: root
- group: root
- mode: '0755'
diff --git a/host_vars/routeur-thot.adm.crans.org.yml b/host_vars/routeur-thot.adm.crans.org.yml
deleted file mode 100644
index 3c61601d364062455dc311bc3ada07b6988dbbce..0000000000000000000000000000000000000000
--- a/host_vars/routeur-thot.adm.crans.org.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-interfaces:
- adm: ens18
- auto: ens19
-
-loc_unattended:
- reboot: true
-
-loc_needrestart:
- override: []
-
-loc_wireguard:
- tunnels:
- - name: "boeing"
- listen_port: 51820
- private_key: "{{ vault.wireguard.routeur_thot.privkey }}"
- table: "off"
- peers:
- - public_key: "{{ vault.wireguard.boeing.aurore.pubkey }}"
- allowed_ips:
- - "{{ lookup('ldap', 'network', 'adm') }}"
- - "fd00:0:0:{{ query('ldap', 'vlanid', 'adm') }}::/64"
- endpoint: "{{ lookup('ldap', 'ip4', 'boeing', 'srv') }}:51822"
- persistent_keepalive: 25
- post_up:
- - "sysctl -w net.ipv4.conf.%i.proxy_arp=1"
- - "sysctl -w net.ipv6.conf.%i.proxy_ndp=1"
- - "ip route add {{ lookup('ldap', 'ip4', 'tealc', 'adm') }} dev %i proto proxy"
- - "python3 /var/local/services/proxy/proxy.py --alter"
- pre_down:
- - "sysctl -w net.ipv4.conf.%i.proxy_arp=0"
- - "sysctl -w net.ipv6.conf.%i.proxy_ndp=0"
- - "ip route flush proto proxy; ip -6 route flush proto proxy; ip neigh flush proxy proto proxy"
-
-
-loc_service_proxy:
- config:
- ldap:
- - server: "ldaps://{{ lookup('ldap', 'ip4', 'wall-e', 'adm') }}/"
- - server: "ldaps://{{ lookup('ldap', 'ip4', 'thot', 'adm') }}/"
- protocol: "proxy"
- filter: ".adm.crans.org"
- proxy:
- default: "boeing"
- aurore: "ens18"
diff --git a/host_vars/thot.adm.crans.org.yml b/host_vars/thot.adm.crans.org.yml
deleted file mode 100644
index 8b2496c74a400d65585706012684e25487f34b6f..0000000000000000000000000000000000000000
--- a/host_vars/thot.adm.crans.org.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-interfaces:
- disable: true
-
-loc_needrestart:
- override: []
-
-loc_borg:
- to_backup:
- - /etc
- - /home_nounou
- - /var
-
-loc_slapd:
- ip: "{{ lookup('ldap', 'ip4', 'thot', 'adm') }}"
- replica: true
- replica_rid: 5
diff --git a/hosts b/hosts
index 6edfe8fb37e3b9169d0ff07d8bd51c4d68398318..0d5406ccd5467ab1a0120705d4481f72b6cfb518 100644
--- a/hosts
+++ b/hosts
@@ -6,7 +6,6 @@ zamok.adm.crans.org
[arpproxy]
boeing.adm.crans.org
routeur-ft.adm.crans.org
-routeur-thot.adm.crans.org
[autoconfig]
hodaur.adm.crans.org
@@ -16,7 +15,6 @@ cameron.adm.crans.org
[backups]
backup-ft.adm.crans.org
-backup-thot.adm.crans.org
[baie]
cameron.adm.crans.org
@@ -49,7 +47,6 @@ routeurs_vm
[dropbear]
ft.adm.crans.org
-thot.adm.crans.org
[docker:children]
gitlab_runner
@@ -224,7 +221,6 @@ helloworld.adm.crans.org
wall-e.adm.crans.org
#sam.adm.crans.org
#sputnik.adm.crans.org
-#thot.adm.crans.org
[sssd]
zamok.adm.crans.org
@@ -245,7 +241,6 @@ sam.adm.crans.org
[virtu_backup]
ft.adm.crans.org
-thot.adm.crans.org
[virtu:children]
virtu_adh
@@ -262,7 +257,6 @@ kiwi.adm.crans.org
[wireguard]
boeing.adm.crans.org
routeur-ft.adm.crans.org
-routeur-thot.adm.crans.org
sputnik.adm.crans.org
[crans_routeurs:children]
@@ -272,7 +266,6 @@ routeurs_vm
zamok.adm.crans.org
[crans_physical:children]
-aurore_physical
baie
virtu
viarezo_physical
@@ -328,19 +321,7 @@ routeur-ft.adm.crans.org
viarezo_physical
viarezo_vm
-[aurore_physical]
-thot.adm.crans.org
-
-[aurore_vm]
-backup-thot.adm.crans.org
-routeur-thot.adm.crans.org
-
-[aurore:children]
-aurore_physical
-aurore_vm
-
[crans_vm:children]
-aurore_vm
routeurs_vm
viarezo_vm
@@ -360,7 +341,6 @@ ilo-jack.adm.crans.org
ilo-odlyd.adm.crans.org
ilo-sam.adm.crans.org
ilo-stitch.adm.crans.org
-ilo-thot.adm.crans.org
ilo-zamok.adm.crans.org
# everything at crans
diff --git a/plays/borgbackup_client.yml b/plays/borgbackup_client.yml
index 945cd80d5b0964bf28e574ec67ba445486c9843f..9f6dcc0da9ca411ffa90a6a7472da7f7d230aa68 100755
--- a/plays/borgbackup_client.yml
+++ b/plays/borgbackup_client.yml
@@ -2,7 +2,7 @@
---
- import_playbook: ssh_known_hosts.yml
-- hosts: server
+- hosts: server,!apprentis.adm.crans.org
vars:
borg: "{{ glob_borg | default({}) | combine(loc_borg | default({})) }}"
roles:
diff --git a/plays/users.yml b/plays/users.yml
index a6522ad18bc6c32ab3d647330f523277252eef59..57ad19fa5a9926c5d93e1c1b50ed6fa1ec1383b5 100755
--- a/plays/users.yml
+++ b/plays/users.yml
@@ -6,7 +6,7 @@
roles:
- ldap-client
-- hosts: server,!ovh_physical,!tealc.adm.crans.org,!sam.adm.crans.org,!routeur-sam.adm.crans.org,!ft.adm.crans.org,!thot.adm.crans.org
+- hosts: server,!ovh_physical,!apprentis.adm.crans.org,!ft.adm.crans.org,!routeur-sam.adm.crans.org,!sam.adm.crans.org,!tealc.adm.crans.org
vars:
nfs_mount: "{{ glob_home_nounou | default({}) | combine(loc_home_nounou | default({})) }}"
roles:
diff --git a/{attempts: b/{attempts:
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000