Feat(inventory): Use short aliases for long host names

diff --git a/hosts.template b/hosts.template
index 4f6f1d1e6b2ff6f07d8e5d663177185db7f02ce7..e4c0a064b368923b433a54f6bfcf38619dbe7a3f 100644 (file)
--- a/hosts.template
+++ b/hosts.template
@@ -1,11 +1,11 @@
-localhost ansible_connection=local
+nb ansible_host=localhost ansible_connection=local
 
 [localnet]
-localhost
+nb ansible_host=localhost
 
 [homenet]
-home.phdru.name
+home ansible_host=home.phdru.name
 
 [servers]
-home.phdru.name
+home ansible_host=home.phdru.name
 phdru.name

diff --git a/playbooks/debian/sa-merge-all.yaml b/playbooks/debian/sa-merge-all.yaml
index 53dd61864cf6b59c65ecd1975a4132bbf737edf8..22779d98253362b0b5df6404b4265c2e968a4fbe 100644 (file)
--- a/playbooks/debian/sa-merge-all.yaml
+++ b/playbooks/debian/sa-merge-all.yaml
@@ -21,13 +21,13 @@
           src: "~/tmp/sa-learn.backup@{{ inventory_hostname }}"
           dest: "~/tmp/sa-learn.backup@{{ inventory_hostname }}"
           mode: pull
-      when: inventory_hostname != 'localhost'
+      when: inventory_hostname != 'nb'
 
     - name: Combine SpamAssassin DB backups
       shell: "exec {{ playbook_dir }}/sa-merge-all.py -o sa-learn.backup sa-learn.backup@*"
       args:
         chdir: "~/tmp"
-      when: inventory_hostname == 'localhost'
+      when: inventory_hostname == 'nb'
 
     - block:
       - name: Push combined SpamAssassin DB backup
@@ -49,7 +49,7 @@
         vars:
           service: exim4
           command: start
-      when: inventory_hostname != 'localhost'
+      when: inventory_hostname != 'nb'
 
     - name: Cleanup
       shell: "exec rm sa-learn.backup*"

diff --git a/playbooks/roles/setup-usrlocal/tasks/main.yaml b/playbooks/roles/setup-usrlocal/tasks/main.yaml
index 2da9650447f19bd0f0d9fef3b6ab920eeaf41fc7..2d80b2c61041d3bba1bc51b6105cbc9aeb62f5fb 100644 (file)
--- a/playbooks/roles/setup-usrlocal/tasks/main.yaml
+++ b/playbooks/roles/setup-usrlocal/tasks/main.yaml
@@ -26,7 +26,7 @@
     owner: phd
     group: "{{ system_group }}"
     recurse: yes
-  when: inventory_hostname == 'iskra-aviel.phdru.name'
+  when: inventory_hostname == 'iskra'
 
 - name: Setup /usr/local/src
   become: true