From a05c2d997dfd1729280199772b53b1f72b829862 Mon Sep 17 00:00:00 2001
From: Emiliano Vavassori <syntaxerrormmm@gmail.com>
Date: Sun, 13 Jul 2025 21:19:35 +0200
Subject: [PATCH] Primi passaggi testati OK.

---
 deploy.yml                     |  1 +
 hosts                          |  2 +-
 roles/domsearch/tasks/main.yml | 20 +++++++++++++-------
 roles/fqdn/tasks/main.yml      |  8 +++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/deploy.yml b/deploy.yml
index 2e4cb8a..d3a148f 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -4,5 +4,6 @@
     - deploy_vars.yml
   roles:
     - fqdn
+    - domsearch
   become: true
   become_user: root
diff --git a/hosts b/hosts
index f737d5b..6805eb0 100644
--- a/hosts
+++ b/hosts
@@ -1,2 +1,2 @@
 #localhost ansible_connection=local
-zorin ansible_hostname=192.168.33.243 ansible_user=utente
+zorin ansible_host=192.168.33.243 ansible_user=utente ansible_connection=ssh
diff --git a/roles/domsearch/tasks/main.yml b/roles/domsearch/tasks/main.yml
index 2d7c2da..2a94382 100644
--- a/roles/domsearch/tasks/main.yml
+++ b/roles/domsearch/tasks/main.yml
@@ -8,7 +8,7 @@
 - name: Identifichiamo il profilo di connessione di NetworkManager
   ansible.builtin.shell: >-
     set -o pipefail;
-    nmcli connection | awk -F"  " "/{{ nic }}/ { print $1 }'
+    nmcli connection | awk -F'  ' '/{{ nic }}/ { print $1 }'
   args:
     executable: /bin/bash
   register: nm_connection
@@ -37,13 +37,19 @@
   ansible.builtin.command: dig +short {{ dcname.stdout | trim }}.
   register: dcipaddr
 
+- name: Determino lo shortname del domain controller
+  ansible.builtin.shell: echo "{{ dcname.stdout| trim }}" | cut -d '.' -f1
+  args:
+    executable: /bin/bash
+  register: dcshortname
+
 - name: Impostiamo qualche fact
   ansible.builtin.set_fact:
-    dc.name: "{{ dcname.stdout | trim }}"
-    dc.shortname: "{{ dc.name.split('.')[0] }}"
-    dc.ipaddr: "{{ dcipaddr | trim }}"
+    dc_name: "{{ dcname.stdout | trim }}"
+    dc_shortname: "{{ dcshortname.stdout | trim }}"
+    dc_ipaddr: "{{ dcipaddr | trim }}"
 
 - name: Verifichiamo che il PC effettivamente risolva gli shortname
-  ansible.builtin.command: dig +short {{ dc.shortname }}
-  register: check_shortnames
-  failed_when: check_shortnames.stdout|trim != {{ dc.ipaddr }}
+  ansible.builtin.command: ping -c3 {{ dc_shortname }}
+  register: check_shortname
+  failed_when: check_shortname.rc != 0
diff --git a/roles/fqdn/tasks/main.yml b/roles/fqdn/tasks/main.yml
index a5af5cb..1b02cd3 100644
--- a/roles/fqdn/tasks/main.yml
+++ b/roles/fqdn/tasks/main.yml
@@ -2,9 +2,11 @@
 # Sistemiamo un po' di impostazioni legate al dominio
 
 - name: Impostazione del dominio
-  ansible.builtin.file:
+  ansible.builtin.lineinfile:
     path: /etc/domainname
-    content: |
+    state: present
+    create: true
+    line: |-
       {{ domain }}
     owner: root
     group: root
@@ -19,4 +21,4 @@
 - name: Verifichiamo che tutto sia in ordine
   ansible.builtin.command: hostname -f
   register: returned_fqdn
-  failed_when: returned_fqdn.stdout != "{{ ansible_hostname }}.{{ domain }}"
+  failed_when: returned_fqdn.stdout|trim !=  ansible_hostname + '.' + domain