Optimized wireguard roles

playbook.yml

@@ -14,16 +14,25 @@
     - server_native-disc-space-check
     - server_native-free-disc-space
     - server_native-btrfs-health-check
-- name: setup standard wireguard hosts
+
-  hosts: wireguard
+# Wireguard Rollen
+- name: setup standard wireguard
+  hosts: wireguard_server
   become: true
   roles:
-    - server_native-wireguard
+    - independent-application-wireguard
-- name: setup wireguard hosts behind firewall\nat
+
+- name: setup wireguard client behind firewall\nat
   hosts: wireguard_behind_firewall
   become: true
   roles:
-    - server_native-wireguard-behind-firewall
+    - client_application-wireguard-behind-firewall
+
+- name: setup wireguard client
+  hosts: wireguard_client
+  become: true
+  roles:
+    - client_application-wireguard
 
 # Native Webserver Roles
 - name: setup homepages
@@ -185,12 +194,6 @@
     - pc_collection-administrator-base
     - pc_driver-non-free
 
-- name: pc_application-wireguard
-  hosts: application_wireguard
-  become: true
-  roles:
-    - pc_application-wireguard
-
 - name: pc_collection-office
   hosts: collection_officetools
   become: true

roles/client_application-wireguard-behind-firewall/README.md

@@ -1,4 +1,4 @@
-# server_native-wireguard-behind-nat
+# client-wireguard-behind-nat
 
 # see
 - https://gist.github.com/insdavm/b1034635ab23b8839bf957aa406b5e39

roles/client_application-wireguard-behind-firewall/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- client_application-wireguard

roles/client_application-wireguard/handlers/main.yml

@@ -0,0 +1,6 @@
+- name: "restart set-mtu.service"
+  systemd:
+    name: set-mtu.service
+    state: restarted
+    enabled: yes
+    daemon_reload: yes

roles/client_application-wireguard/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- independent-application-wireguard

roles/client_application-wireguard/tasks/main.yml

@@ -0,0 +1,11 @@
+- name: create set-mtu.service
+  copy: 
+    src:  set-mtu.service
+    dest: /etc/systemd/system/set-mtu.service
+  notify: restart set-mtu.service
+
+- name: create set-mtu.sh
+  template: 
+    src:  set-mtu.sh.j2
+    dest: /usr/local/bin/set-mtu.sh
+  notify: restart set-mtu.service

roles/independent-application-wireguard/handlers/main.yml

@@ -4,3 +4,6 @@
     state: restarted
     enabled: yes
     daemon_reload: yes
+
+- name: "reload sysctl configuration"
+  shell: "sysctl --load='/etc/sysctl.d/wireguard-ip.conf'"

roles/independent-application-wireguard/tasks/main.yml

@@ -1,11 +1,23 @@
 - name: install wireguard for Arch
-  pacman: name=wireguard-tools state=present
+  pacman: 
+    name:   wireguard-tools
+    state:  present
   when: ansible_os_family == "Archlinux"
 
 - name: install wireguard for Ubuntu
-  apt: name=wireguard state=present
+  apt: 
+    name:   wireguard
+    state:  present
   when: ansible_os_family == "Debian"
 
+- name: create wireguard-ip.conf
+  copy:
+    src: "wireguard-ip.conf"
+    dest: /etc/sysctl.d/wireguard-ip.conf
+    owner: root
+    group: root
+  notify: reload sysctl configuration
+
 - name: create /etc/wireguard/wg0.conf
   copy:
     src: "{{ inventory_dir }}/files/{{ inventory_hostname }}/etc/wireguard/wg0.conf"
@@ -13,9 +25,3 @@
     owner: root
     group: root
   notify: restart wireguard
-
-- name: enable ipv4-forwarding
-  shell: sysctl net.ipv4.ip_forward=1
-
-- name: enable ipv6-forwarding
-  shell: sysctl net.ipv6.conf.all.forwarding=1

roles/pc_application-wireguard/handlers/main.yml

@@ -1,16 +0,0 @@
-- name: "restart set-mtu.service"
-  systemd:
-    name: set-mtu.service
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
-
-- name: "restart wireguard"
-  systemd:
-    name: wg-quick@wg0.service
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
-
-- name: "reload sysctl configuration"
-  shell: "sysctl -p"

roles/pc_application-wireguard/tasks/main.yml

@@ -1,32 +0,0 @@
-- name: install wireguard
-  pacman: 
-    name: wireguard-tools
-    state: present
-
-- name: create set-mtu.service
-  copy: 
-    src:  set-mtu.service
-    dest: /etc/systemd/system/set-mtu.service
-  notify: restart set-mtu.service
-
-- name: create set-mtu.sh
-  template: 
-    src:  set-mtu.sh.j2
-    dest: /usr/local/bin/set-mtu.sh
-  notify: restart set-mtu.service
-
-- name: create wireguard-ip.conf
-  copy:
-    src: "wireguard-ip.conf"
-    dest: /etc/sysctl.d/wireguard-ip.conf
-    owner: root
-    group: root
-  notify: reload sysctl configuration
-
-- name: create /etc/wireguard/wg0.conf
-  copy:
-    src: "{{ inventory_dir }}/files/{{ inventory_hostname }}/etc/wireguard/wg0.conf"
-    dest: /etc/wireguard/wg0.conf
-    owner: root
-    group: root
-  notify: restart wireguard

roles/server_native-wireguard-behind-firewall/meta/main.yml

@@ -1,2 +0,0 @@
-dependencies:
-- server_native-wireguard