Merge pull request #12 from vincentvdk/fix/11

Fix #11
stationgroup · Sep 14, 2018 · f708bc9 · f708bc9
2 parents e291ce2 + 9e5b355
commit f708bc9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/add-users-groups-authorized_keys-dot-files/group_vars/all b/add-users-groups-authorized_keys-dot-files/group_vars/all
@@ -35,7 +35,8 @@ users:
           #multiline
         state: absent
     ssh_config:
-      - ServerAliveInterval: 10
+      - line: "ServerAliveInterval: 10"
+      - line: "Compression no"
   - name: test
     state: present
     keys:

diff --git a/add-users-groups-authorized_keys-dot-files/hosts b/add-users-groups-authorized_keys-dot-files/hosts
@@ -1,3 +1,3 @@
-10.106.116.157 ssh_short_name=host1 ansible_user=root
-10.106.116.139 ssh_short_name=host2 ansible_user=root
-34.242.108.38 ssh_short_name=freebsd1 ansible_user=ec2-user ansible_python_interpreter=/usr/local/bin/python2.7
+10.106.116.157 ansible_user=root
+10.106.116.139 ansible_user=root
+#34.242.108.38 ssh_short_name=freebsd1 ansible_user=ec2-user ansible_python_interpreter=/usr/local/bin/python2.7
diff --git a/add-users-groups-authorized_keys-dot-files/roles/ssh-config/tasks/main.yml b/add-users-groups-authorized_keys-dot-files/roles/ssh-config/tasks/main.yml
@@ -19,27 +19,37 @@
   no_log: True
 
 
+- name: CHECK VARS
+  debug:
+    msg: "{{ item.1 }}"
+  with_subelements:
+    - "{{ users }}"
+    - ssh_config
+    - skip_missing: true
+  when: item.0.state == "present"
+
 - name: Configure ~/.ssh/config
   blockinfile:
-    path: "/home/{{ item.0.name  }}/.ssh/config"
-    owner: "{{ item.0.name }}"
-    group: "{{ item.0.name }}"
+    #path: "/home/{{ item.0.name  }}/.ssh/config"
+    path: "/home/{{ item.name  }}/.ssh/config"
+    #owner: "{{ item.0.name }}"
+    owner: "{{ item.name }}"
+    #group: "{{ item.0.name }}"
+    group: "{{ item.name }}"
     mode: 0600
     marker: "# {mark} ANSIBLE MANAGED BLOCK"
     content: |
       {% for host in groups['all'] -%} 
-      Host {{ hostvars[host]['ssh_short_name'] }}
+      Host {{ hostvars[host]['ansible_hostname'] }}
           Hostname {{ hostvars[host]['inventory_hostname'] }}
-          RemoteForward /home/{{ item.0.name }}/.gnupg/S.gpg-agent $HOME/.gnupg/S.gpg-agent
-          RemoteForward /home/{{ item.0.name }}/.gnupg/S.gpg-agent.ssh $HOME/.gnupg/S.gpg-agent.ssh
-      {% for k,v  in item.1.items() %}
-      {% if k|lower != "host" and k|lower != "hostname" %}
-          {{k}} {{v}}
-      {% endif %}
+          RemoteForward /home/{{ item.name }}/.gnupg/S.gpg-agent $HOME/.gnupg/S.gpg-agent
+          RemoteForward /home/{{ item.name }}/.gnupg/S.gpg-agent.ssh $HOME/.gnupg/S.gpg-agent.ssh
+      {% for item in item.ssh_config %}
+          {{ item.line }}
       {% endfor %}
       {% endfor %}
-  with_subelements:
+  with_items:
     - "{{ users }}"
-    - ssh_config
     - skip_missing: true
-  when: item.0.state == "present"
+  when: item.ssh_config is defined and item.state == "present"
+