Merge branch 'master' of ssh://gitlab.social.my-wan.de:22422/rene/ansible-pull

hosts

@@ -35,6 +35,7 @@ coruscant.universe.local
 
 [docker]
 docker01
+docker02
 
 [fileserver]
 coruscant.universe.local

roles/base/tasks/main.yml

@@ -8,6 +8,15 @@
       msg: Debug
   # basics
   - import_tasks: system_setup/hostname.yml
+  - include_tasks: system_setup/hosts.yml
+  - import_tasks: system_setup/clock.yml
+  - import_tasks: system_setup/locale.yml
+  - include_tasks: system-setup/wireguard.yml
+    when:
+      - wireguard is defined
+      - wireguard == true
+      - ansible_default_ipv4.address | ipaddr('public')
+    ignore_errors: True
   - import_tasks: system_setup/git.yml
   # install software
   # - import_tasks: software/repositories.yml
@@ -19,9 +28,7 @@
 
   # Perform remaining tasks:
   - import_tasks: users.yml
-  - import_tasks: system_setup/clock.yml
   - import_tasks: system_setup/cron.yml
-  - import_tasks: system_setup/locale.yml
   # - import_tasks: system_setup/logging.yml
   # - import_tasks: system_setup/memory.yml
   # - import_tasks: system_setup/microcode.yml

roles/base/tasks/system_setup/wireguard.yml

@@ -1,9 +1,9 @@
-- name: server | utilities | wireguard install
+- name: base | system setup | wireguard install
   package:
     name: "{{ wireguard_package }}"
     state: latest
 
-- name: server | utilities | wireguard generate private key
+- name: base | system setup | wireguard generate private key
   shell:
     cmd: umask 077 && wg genkey | tee privatekey | wg pubkey > publickey
     chdir: /etc/wireguard
@@ -12,25 +12,25 @@
     - wg_privkey is not defined
     - wg_pubkey is not defined
 
-- name: server | utilities | wireguard cat pubkey
+- name: base | system setup | wireguard cat pubkey
   command: "cat /etc/wireguard/publickey"
   register: wg_publickkey
   when:
     - wg_pubkey is not defined
 
-- name: server | utilities | wireguard output pubkey
+- name: base | system setup | wireguard output pubkey
   debug:
     var: wg_publickkey.stdout_lines
   when:
     - wg_pubkey is not defined
 
-- name: server | utilities | wireguard pause
+- name: base | system setup | wireguard pause
   pause:
     prompt: please copy pubkey to your wireguard server
   when:
     - wg_pubkey is not defined
 
-- name: server | utilities | wireguard copy keys
+- name: base | system setup | wireguard copy keys
   copy:
     content: "{{ item.key }}"
     dest: "{{ item.keyfile }}"
@@ -42,7 +42,7 @@
     - wg_pubkey is defined
     - wg_privkey is defined
 
-- name: server | utilities | wireguard generate config
+- name: base | system setup | wireguard generate config
   template:
     dest: "/etc/wireguard/VPN.conf"
     src: client_VPN.conf.j2
@@ -50,15 +50,15 @@
     group: root
     mode: '0600'
 
-- name: server | utilities | wireguard check if already running
+- name: base | system setup | wireguard check if already running
   command: wg show
   register: wireguard
 
 - block:
-  - name: server | utilities | wireguard start vpn
+  - name: base | system setup | wireguard start vpn
     command: wg-quick up VPN
 
-  - name: server | utilities | wireguard enable service
+  - name: base | system setup | wireguard enable service
     service:
       name: "wg-quick@VPN"
       enabled: true

roles/server/tasks/main.yml

@@ -7,7 +7,6 @@
   ignore_errors: True
 
 - block:
-  - include_tasks: system_setup/hosts.yml
   - include_tasks: utilities/ssmtp.yml
   - include_tasks: utilities/netdata.yml
     when: netdata is defined and netdata == true
@@ -16,15 +15,9 @@
     when:
       - glusterfs is defined
       - glusterfs == true
-  - include_tasks: utilities/wireguard.yml
-    when:
-      - wireguard is defined
-      - wireguard == true
-      - ansible_default_ipv4.address | ipaddr('public')
-    ignore_errors: True
   - include_tasks: system_setup/cron.yml
-  - include_role:
-      name: base
-      tasks_from: users.yml
+  # - include_role:
+  #     name: base
+  #     tasks_from: users.yml
 
 # vim: ts=2 sw=2