From b232b894c3cbe087c8d504e91637dcf62199eed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= <me@rgoncalves.se>
Date: Thu, 29 Jul 2021 17:00:20 +0200
Subject: Bump to third revision of homelab

---
 roles/_workstation/env/tasks/main.yml         |  7 +++++++
 roles/_workstation/sshdns/defaults/main.yml   |  3 ---
 roles/_workstation/sshdns/tasks/main.yml      | 17 -----------------
 roles/_workstation/sshdns/templates/sshdns.j2 | 20 --------------------
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 roles/_workstation/sshdns/defaults/main.yml
 delete mode 100644 roles/_workstation/sshdns/tasks/main.yml
 delete mode 100644 roles/_workstation/sshdns/templates/sshdns.j2

(limited to 'roles/_workstation')

diff --git a/roles/_workstation/env/tasks/main.yml b/roles/_workstation/env/tasks/main.yml
index 261170e..ff9acd2 100644
--- a/roles/_workstation/env/tasks/main.yml
+++ b/roles/_workstation/env/tasks/main.yml
@@ -12,6 +12,13 @@
   shell: cat /etc/passwd | cut -d ":" -f 1
   register: result
 
+- name: retrieve current user
+  shell: whoami
+  register: result_
+
+- set_fact:
+    _ws_user: "{{ result_.stdout_lines[0] }}"
+
 - name: check if target user exists
   fail:
     msg: _ws_user is not a valid user
diff --git a/roles/_workstation/sshdns/defaults/main.yml b/roles/_workstation/sshdns/defaults/main.yml
deleted file mode 100644
index 9427f1d..0000000
--- a/roles/_workstation/sshdns/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-sshdns_waittime: 2
diff --git a/roles/_workstation/sshdns/tasks/main.yml b/roles/_workstation/sshdns/tasks/main.yml
deleted file mode 100644
index daf8f61..0000000
--- a/roles/_workstation/sshdns/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- name: create config directory
-  file:
-    path: '/home/{{ _ws_user }}/.ssh/config.d'
-    state: directory
-    group: '{{ _ws_user }}'
-    owner: '{{ _ws_user }}'
-    mode: '0700'
-
-- name: generate template to localhost
-  template:
-    src: templates/sshdns.j2
-    dest: '/home/{{ _ws_user }}//.ssh/config.d/ssh_dns'
-    owner: '{{ _ws_user }}'
-    group: '{{ _ws_user }}'
-    mode: '0600'
diff --git a/roles/_workstation/sshdns/templates/sshdns.j2 b/roles/_workstation/sshdns/templates/sshdns.j2
deleted file mode 100644
index 1778215..0000000
--- a/roles/_workstation/sshdns/templates/sshdns.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% import 'macros.j2' as macros with context %}
-
-# ssh configuration for dns ~~ ~/.ssh/.config.d/
-# managed by Ansible
-
-{% set dcontroller = hostvars[global.dcontroller] %}
-{% call(h) macros.loop_hosts("servers") %}
-{% if h.ip is defined and h.services is defined %}
-{% set _port = h.services | selectattr("name", "equalto", "ssh") | map(attribute="port") | list | join(' ') %}
-# {{ h.ansible_host }}
-Match originalhost {{ h.ansible_host }} exec "ping -c 1 -w {{ sshdns_waittime }} {{ dcontroller.ip.in }} && ! ping -c 1 -w {{ sshdns_waittime }} {{ h.ip.out }}"
-	HostName {{ h.ip.in }}
-	Port {{ _port }}
-Match originalhost {{ h.ansible_host }}
-	HostName {{ h.ip.out }}
-	Port {{ _port }}
-	User root
-
-{% endif %}
-{% endcall %}
-- 
cgit v1.2.3