Minor fixes and cleanup

7 files changed, 11 insertions, 28 deletions

diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index e6c3b08..5090bbf 100644
--- a/roles/common/tasks/pkgs.yml
+++ b/roles/common/tasks/pkgs.yml
@@ -21,6 +21,7 @@
     - elinks
     - mutt
     - profanity
+    - xmppc
     - nfs-utils
     - tcpdump
     - bind-utils
diff --git a/roles/common/tasks/xmppc.yml b/roles/common/tasks/xmppc.yml
index 172bc3d..a41591c 100644
--- a/roles/common/tasks/xmppc.yml
+++ b/roles/common/tasks/xmppc.yml
@@ -10,19 +10,14 @@
     state: directory
     mode: 0700
 
-- name: Configuration de xmppc pour root
-  template:
-    src: xmppc.conf.j2
-    dest: /root/.config/xmppc.conf
-    mode: 0644
-  when: jid is defined
-  tags: keys
-
-- name: Configuration de xmppc pour /etc/skels
+- name: Configuration de xmppc pour root et skels
   template:
     src: skels_xmppc.conf.j2
-    dest: /etc/skels/.config/xmppc.conf
+    dest: "{{ item }}"
     mode: 0644
+  loop:
+    - /root/.config/xmppc.conf
+    - /etc/skels/.config/xmppc.conf
   tags: keys
 
 - name: Installation du script IM systemd
diff --git a/roles/common/templates/dhclient6.conf.j2 b/roles/common/templates/dhclient6.conf.j2
index 922f2c3..74da40c 100644
--- a/roles/common/templates/dhclient6.conf.j2
+++ b/roles/common/templates/dhclient6.conf.j2
@@ -1,3 +1,6 @@
+#
+# {{ ansible_managed }}
+#
 interface "eth0" {
     send dhcp6.client-id {{ duid }};
     request;
diff --git a/roles/common/templates/xmppc.conf.j2 b/roles/common/templates/xmppc.conf.j2
deleted file mode 100644
index 8011744..0000000
--- a/roles/common/templates/xmppc.conf.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-[default]
-jid = {{ jid }}
-pwd = {{ jpwd }}
diff --git a/roles/diagnostics/tasks/at.yml b/roles/diagnostics/tasks/at.yml
deleted file mode 100644
index 42c9093..0000000
--- a/roles/diagnostics/tasks/at.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: Installation démon At et xmppc
-  package:
-    name: "{{ item }}"
-    state: present
-  loop:
-    - at
-    - xmppc
diff --git a/roles/diagnostics/tasks/main.yml b/roles/diagnostics/tasks/main.yml
index c28629b..e6de2d3 100644
--- a/roles/diagnostics/tasks/main.yml
+++ b/roles/diagnostics/tasks/main.yml
@@ -4,9 +4,6 @@
 - name: Désinstallation de cockpit
   import_tasks: cockpit.yml
 
-- name: Configuration démon At
-  import_tasks: at.yml
-
 - name: Configuration des timers systemd
   import_tasks: timers.yml
 
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone
index 1ebea4c..8d298a3 100644
--- a/roles/dnsserver/files/casperlefantom.net.zone
+++ b/roles/dnsserver/files/casperlefantom.net.zone
@@ -337,8 +337,8 @@ _xmpp-client._tcp IN SRV 5 0 5222 jabber.casperlefantom.net.
 _xmpp-client._tcp IN SRV 10 0 5222 jabber2.casperlefantom.net.
 _xmpp-server._tcp IN SRV 5 0 5269 jabber.casperlefantom.net.
 _xmpp-server._tcp IN SRV 10 0 5269 jabber2.casperlefantom.net.
-_xmpp-server._tcp IN SRV 15 0 5269 im1.casperlefantom.net.
-_xmpp-server._tcp IN SRV 20 0 5269 im2.casperlefantom.net.
+_xmpp-server._tcp IN SRV 15 0 5269 turn1.casperlefantom.net.
+_xmpp-server._tcp IN SRV 20 0 5269 turn2.casperlefantom.net.
 
 _stun._udp IN SRV 5 0 3478 stun1.casperlefantom.net.
 _stun._udp IN SRV 10 0 3478 stun2.casperlefantom.net.