enhance update of listen-port on clients

The server cannot change its port. Therefore we set two different ports.
We also remove the redundant firewall tag

README.md

@@ -109,6 +109,5 @@ available ones:
 
 * `cidr`: configure CIDRs
 * `update`: update the innernet binaries
-* `firewall`: configure firewall settings
 * `listen_port`: edit/set the listen port between server and clients
 * `uninstall`: delete innernet configuration and packages from systems

group_vars/all.yml

@@ -5,7 +5,8 @@ network_name: "fsfe"
 # 65,536 usable IP addresses
 network_cidr: "10.200.0.0/16"
 # wiregaurd listening port
-network_listen_port: "51820"
+network_listen_port_clients: "51820"
+network_listen_port_server: "51820"
 cidrs:
   ## humans
   ## 10.200.16.1 to 10.200.31.254

roles/client/tasks/main.yml

@@ -100,24 +100,22 @@
   when:
     - innernet_client not in existing_peers.stdout_lines
 
-- name: Set listen port
+- name: Set listen port on client
   tags: [listen_port]
-  ini_file:
+  shell: |
-    path: "/etc/innernet/{{ network_name }}.conf"
+        innernet set-listen-port {{ network_name }} \
-    section: interface
+          -l {{ network_listen_port_clients }} \
-    option: listen-port
+          --yes
-    value: "{{ network_listen_port }}"
-    mode: 600
-    backup: yes
 
 - name: Allow UDP traffic on WireGuard port
-  tags: [listen_port, firewall]
+  tags: [listen_port]
   ufw:
-    to_port: "{{ network_listen_port }}"
+    to_port: "{{ network_listen_port_clients }}"
     rule: allow
     proto: udp
 
 - name: Restart and enable innernet daemon
+  tags: [update, listen_port]
   systemd:
     name: "innernet@{{ network_name }}"
     state: restarted

roles/server/tasks/main.yml

@@ -101,7 +101,6 @@
     - item.key not in existing_peers.stdout_lines
 
 - name: Enable firewall and allow SSH
-  tags: [listen_port, firewall]
   ufw:
     state: enabled
     default: deny
@@ -109,12 +108,12 @@
     rule: allow
 
 - name: Allow UDP traffic on WireGuard port
-  tags: [listen_port, firewall]
   ufw:
-    to_port: "{{ network_listen_port }}"
+    to_port: "{{ network_listen_port_server }}"
     rule: allow
 
 - name: Restart and enable innernet-server daemon
+  tags: [update, listen_port]
   systemd:
     name: "innernet-server@{{ network_name }}"
     state: restarted