created major large-scale changes

roles/init-server/tasks/contingent/pkg/dsnet.yml

@@ -29,7 +29,7 @@
   ansible.builtin.shell:
     cmd: "dsnet add {{ item.name }}{{ idx }} --owner {{ current_user.stdout }} --description 'For {{ item.name }}--{{ item.desc }}' --confirm > {{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ (idx | string) }}.conf"
     creates: "{{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ idx }}.conf"
-  loop: "{{ vpn_server.clients }}"
+  loop: "{{ vpn.clients }}"
   loop_control:
     index_var: idx
 - name: Changing ownership of consequent DSNet VPN service client configurations
@@ -37,8 +37,9 @@
     path: "{{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ (idx | string) }}.conf"
     owner: "{{ ansible_user }}"
     group: "{{ ansible_user }}"
+    mode: "600"
     state: file
-  loop: "{{ vpn_server.clients }}"
+  loop: "{{ vpn.clients }}"
   loop_control:
     index_var: idx
 - name: Pausing to inquire about how to proceed
@@ -52,30 +53,47 @@
     - name: Acquiring contents of DSNet VPN service client configuration files
       ansible.builtin.slurp:
         src: "{{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ (idx | string) }}.conf"
-      loop: "{{ vpn_server.clients }}"
+      loop: "{{ vpn.clients }}"
       loop_control:
         index_var: idx
       register: vpn_client_configs
     - name: Presenting contents of DSNet VPN service client configurations to control node
       ansible.builtin.debug:
-        msg: "Copy this client configuration of the DSNet VPN service:\n {{ item.content }}"
+        msg: "Copy this client configuration of the DSNet VPN service:\n {{ item.content | b64decode }}"
       loop: "{{ vpn_client_configs.results }}"
     - name: Giving opportunity to manually copy contents of DSNet VPN service client configuration files
       ansible.builtin.pause:
 - name: Providing DSNet VPN service client configuration files to control node machine
   when: data_method.user_input == "fetch"
   block:
+    - name: Informing user of inventory requirements for VPN clients
+      when: not item.name in groups.homeserver
+      ansible.builtin.fail:
+        msg: The VPN client must be the name of an inventory host in a homeserver group
+      loop: "{{ vpn.clients }}"
+    - name: Dupliciating DSNet VPN service client configuration files to control node
+      when: item.name in groups.homeserver
+      ansible.builtin.fetch:
+        src: "{{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ (idx | string) }}.conf"
+        dest: "./.tmp/{{ inventory_hostname }}-dsnet/"
+        flat: true
+      loop: "{{ vpn.clients }}"
+      loop_control:
+        index_var: idx
     - name: Dupliciating DSNet VPN service client configuration files to control node
       ansible.builtin.fetch:
         src: "{{ ansible_user_home.stdout }}/.wg/authorized_clients.d/{{ item.name }}{{ (idx | string) }}.conf"
-        dest: "./.tmp/{{ inventory_hostname }}-dsnet/wg/"
+        dest: "./roles/init-server/files/user/wg/containerized/{{ item.name }}{{ (idx | string) }}.conf"
         flat: true
-      loop: "{{ vpn_server.clients }}"
+      loop: "{{ vpn.clients }}"
       loop_control:
         index_var: idx
     - name: Informing control node of acquired files
       ansible.builtin.debug:
-        msg: "The DSNet VPS service client configuration files have been duplicated to '/var/tmp/{{ inventory_hostname }}/wg/' at the control node."
+        msg: "The DSNet VPS service client configuration files have been duplicated to \"{{ item }}\" at the control node."
+      loop:
+        - "./.tmp/{{ inventory_hostname }}-dsnet/"
+        - "./roles/init-server/files/user/wg/"
     - name: Giving control node user time to read the aforementiioned message
       ansible.builtin.pause:
         seconds: 30
@@ -106,12 +124,12 @@
     daemon_reload: true
 - name: Copying script for DSNet iptables rules
   become: true
-  ansible.builtin.copy:
-    src: usr/local/bin/dsnet-forward.sh
-    dest: /usr/local/bin/
+  ansible.builtin.template:
+    src: usr/local/bin/dsnet-forward.sh.j2
+    dest: /usr/local/bin/dsnet-forward.sh
     owner: root
     group: root
-    mode: "744"
+    mode: "755"
     force: true
     backup: true
 - name: Creating SystemD unit for DSNet iptables rules
@@ -123,25 +141,19 @@
     group: root
     force: true
     backup: true
-- name: Reloading SystemD and enabling iptables rules SystemD unit
+- name: Reloading SystemD
   become: true
   ansible.builtin.systemd_service:
     name: thrunet
-    enabled: true
     daemon_reload: true
-- name: Forwarding network traffic on certain ports to Wireguard VPS service interface
+- name: Opening port 51820
   become: true
   ansible.builtin.iptables:
-    chain: FORWARD
-    protocol: "{{ item[0][0] }}"
-    source_port: "{{ item[0][1] }}"
-    in_interface: "{{ item[1] }}"
+    chain: INPUT
+    protocol: "{{ item }}"
+    destination_port: 51820
     jump: ACCEPT
-  loop: "{{ vpn_server.forwards | product([vpn_server.interface]) }}"
-- name: Forwarding network traffic on certain ports to Wireguard VPS service interface
-  become: true
-  ansible.builtin.iptables:
-    table: nat
-    chain: POSTROUTING
-    out_interface: "{{ vpn_server.interface }}"
-    jump: MASQUERADE
+    comment: Open up port 51820
+  loop:
+    - udp
+    - tcp