From 571f694ed199724c2904081b3e5ff7d53b01ab36 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Mon, 24 May 2021 18:28:25 +0200
Subject: [PATCH] templier is here

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 group_vars/debian.yml          |  2 +-
 hosts                          | 17 ++++++++++++++---
 plays/base.yml                 | 10 +++++-----
 roles/apt/tasks/main.yml       | 15 ++++++++++++---
 roles/cli-utils/tasks/main.yml |  1 +
 5 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/group_vars/debian.yml b/group_vars/debian.yml
index fbbf164..186d671 100644
--- a/group_vars/debian.yml
+++ b/group_vars/debian.yml
@@ -1,6 +1,6 @@
 ---
 glob_apt:
-  mirror: "http://mirror.crans.org/"
+  mirror: "http://mirror.adm.ynerant.fr/"
   backports: false
   extra_repositories: []
   pin:
diff --git a/hosts b/hosts
index c4e6db6..d7f285c 100644
--- a/hosts
+++ b/hosts
@@ -9,15 +9,26 @@ ynerant-pc.fil.sand.auro.re
 ynerant-thinkpad.wifi.sand.auro.re
 localhost
 
-[server]
-templier.adh.crans.org
-dt.adh.crans.org
+[server:children]
+virtu
+vm
 
 [slapd]
 dt.adh.crans.org
 
 [virtu]
 dt.adh.crans.org
+templier.adm.ynerant.fr
+
+[vm]
+routeur-templier.adm.ynerant.fr
+proxy.adm.ynerant.fr
+dns.adm.ynerant.fr
+mailu.adm.ynerant.fr
+psql.adm.ynerant.fr
+synapse.adm.ynerant.fr
+docker.adm.ynerant.fr
+# candilib.adm.ynerant.fr
 
 [all:vars]
 # Force remote to use Python 3
diff --git a/plays/base.yml b/plays/base.yml
index fb18917..fa0786f 100755
--- a/plays/base.yml
+++ b/plays/base.yml
@@ -10,11 +10,11 @@
     - vim
     - ssh
 
-- hosts: templier.adh.crans.org
-  roles:
-    - bind
-    - docker
-  become: yes
+#- hosts: templier.adh.crans.org
+#  roles:
+#    - bind
+#    - docker
+#  become: yes
 
 - hosts: perso
   roles:
diff --git a/roles/apt/tasks/main.yml b/roles/apt/tasks/main.yml
index 53ad8ab..0957379 100644
--- a/roles/apt/tasks/main.yml
+++ b/roles/apt/tasks/main.yml
@@ -1,13 +1,22 @@
 ---
+- name: Clear charybde configuration
+  lineinfile:
+    state: absent
+    path: /etc/hosts
+    regex: "^{{ item }}"
+  loop:
+    - "185.230.79.30"
+    - "2a0c:700:2:0:ea39:35ff:fef0:48c9"
+
 - name: Add mirror.crans.org in /etc/hosts
   lineinfile:
     state: present
     path: /etc/hosts
     regex: "^{{ item }}"
-    line: "{{ item }} mirror.crans.org charybde.crans.org mirror"
+    line: "{{ item }} mirror.adm.ynerant.fr"
   loop:
-    - "185.230.79.30"
-    - "2a0c:700:2:0:ea39:35ff:fef0:48c9"
+    - "172.16.42.102"
+    - "fd00::42:4000:ff:fe01:242"
 
 - name: Configure Debian repositories
   template:
diff --git a/roles/cli-utils/tasks/main.yml b/roles/cli-utils/tasks/main.yml
index 82fe6be..db27709 100644
--- a/roles/cli-utils/tasks/main.yml
+++ b/roles/cli-utils/tasks/main.yml
@@ -5,6 +5,7 @@
       - bash
       - bash-completion
       - bat
+      - curl
       - "{% if ansible_os_family == 'Debian' %}dnsutils{% else %}bind-tools{% endif %}"
       - git
       - man