cleanup: remove old tunnelmanager things

pktpls · Sep 24, 2024 · d597c96 · d597c96
1 parent ba601d2
commit d597c96
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 39 deletions.
diff --git a/group_vars/all/general.yml b/group_vars/all/general.yml
@@ -29,8 +29,6 @@ sysupgrade_preserve_custom_files:
   - /etc/uhttpd.key
   - /etc/dropbear/dropbear_rsa_host_key
   - /etc/dropbear/dropbear_ed25519_host_key
-  - /etc/wireguard/wg.pub
-  - /etc/wireguard/wg.key
   - /root/
 
 image_search_pattern: "*-sysupgrade.*"

diff --git a/roles/cfg_openwrt/templates/common/config/network.j2 b/roles/cfg_openwrt/templates/common/config/network.j2
@@ -32,13 +32,12 @@ config interface 'loopback'
     {% set port = int_port + ('' if untagged else '.' + vid) %}
   {% endif %}
   {% set bridge_name = 'br-' + name %}
-  {% set bridge_needed = name in wifi_networks or network.get('mesh_ap') == inventory_hostname or (role == 'corerouter' and 'tunnel_wan_ip' in network) or (role == 'corerouter' and network['role'] == 'uplink' and network.get('uplink_mode') != 'direct') %}
+  {% set bridge_needed = name in wifi_networks or network.get('mesh_ap') == inventory_hostname or (role == 'corerouter' and network['role'] == 'uplink' and network.get('uplink_mode') != 'direct') %}
   {% set port_needed = not (role == 'corerouter' and network.get('mesh_ap') == inventory_hostname) %}
 
   {%- if (role == 'corerouter' and network['role'] == 'mesh') or ('assignments' in network and inventory_hostname in network['assignments'])
      or name in wifi_networks
      or network.get('mesh_ap') == inventory_hostname
-     or (role == 'corerouter' and 'tunnel_wan_ip' in network)
      or (role == 'corerouter' and network['role'] == 'uplink' and network.get('uplink_mode') != 'direct')
      %}
 config interface '{{ name }}'

diff --git a/roles/cfg_openwrt/templates/corerouter/config/tunnelmanager.j2 b/roles/cfg_openwrt/templates/corerouter/config/tunnelmanager.j2
diff --git a/roles/cfg_openwrt/templates/corerouter/nftables.d/20-wg-maxseg-size.nft.j2 b/roles/cfg_openwrt/templates/corerouter/nftables.d/20-wg-maxseg-size.nft.j2
@@ -1,17 +1,3 @@
-{% if (networks | selectattr('tunnel_wan_ip', 'defined') | count > 0) %}
-{% set TCP_HEADER_SIZE = 20 %}
-{% set IPV4_HEADER_SIZE = 20 %}
-{% set IPV6_HEADER_SIZE = 40 %}
-{% set min_mtu = ([1280] + (networks | selectattr('tunnel_mtu', 'defined') | map(attribute='tunnel_mtu') | list)) | min | int %}
-{% set ipv4_mss = min_mtu - TCP_HEADER_SIZE - IPV4_HEADER_SIZE %}
-{% set ipv6_mss = min_mtu - TCP_HEADER_SIZE - IPV6_HEADER_SIZE %}
-chain wg_maxseg {
-    type filter hook forward priority -1; policy accept;
-	oifname "wg_*" tcp flags syn tcp option maxseg size set meta nfproto map { ipv4 : {{ ipv4_mss }}, ipv6 : {{ ipv6_mss }} }
-	iifname "wg_*" tcp flags syn tcp option maxseg size set meta nfproto map { ipv4 : {{ ipv4_mss }}, ipv6 : {{ ipv6_mss }} }
-}
-{% endif %}
-
 {% if (networks | selectattr('role', 'equalto', 'tunnel') | count > 0) %}
 {% set TCP_HEADER_SIZE = 20 %}
 {% set IPV4_HEADER_SIZE = 20 %}