Browse Source

interfaces: Remove tinc legacy stuff.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 5 years ago
parent
commit
3e67da323c
1 changed files with 1 additions and 18 deletions
  1. 1 18
      network/interfaces/interfaces.tmpl

+ 1 - 18
network/interfaces/interfaces.tmpl

@@ -10,20 +10,9 @@
 #source /etc/network/interfaces.d/*
 
 {#
- # Configure any secondary IPs / router_id / infra-srv IPs on loopback, if present
+ # Configure any secondary IPs / router_id on loopback, if present
  #}
 {%- set lo_prefixes = ifaces['lo']['prefixes'] %}
-
-{#- Add user/infra-srv VPN IPs, too #}
-{%- for vpn in ['user-srv', 'infra-srv'] %}
-  {#- COMPATIBILITY GLUE #}
-  {%- for prefix in salt['pillar.get']("tinc:" ~ vpn ~ ":" ~ grains['nodename'] ~ ":subnet", []) %}
-    {%- do lo_prefixes.append (prefix) %}
-  {%- endfor %}
-  {%- for prefix in salt['pillar.get']("tinc:" ~ vpn ~ ":" ~ grains['id'] ~ ":subnet", []) %}
-    {%- do lo_prefixes.append (prefix) %}
-  {%- endfor %}
-{%- endfor %}
 # The loopback network interface
 auto lo
 iface lo
@@ -90,9 +79,3 @@ iface {{ interface }}
  # OpenVPN VPNs (if any)
  #}
 {%- include "network/interfaces/openvpn.tmpl" %}
-
-
-{#-
- # Tinc VPNs (if any)
- #}
-{#%- include "network/interfaces/tinc.tmpl" %#}