From 09f971ff9c0bd47b323606d8cb1f5946940a1eab Mon Sep 17 00:00:00 2001 From: Freifunk Troisdorf Date: Sat, 9 Feb 2019 12:38:48 +0100 Subject: [PATCH] Replace fixed value with variables --- files/l2tp_backbone.sh.exit.j2 | 4 ++-- files/l2tp_broker.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/l2tp_backbone.sh.exit.j2 b/files/l2tp_backbone.sh.exit.j2 index 19dfbad..225743d 100644 --- a/files/l2tp_backbone.sh.exit.j2 +++ b/files/l2tp_backbone.sh.exit.j2 @@ -3,9 +3,9 @@ sleep 60 batctl=/usr/local/sbin/batctl ip=/sbin/ip -communitymacaddress="a2:8c:ae:6f:f6" +communitymacaddress="{{ communitymac }}" localserver=$(/bin/hostname) -communityname=troisdorf +communityname={{ communityname }} # Rest Starten $ip link set address $communitymacaddress:0${localserver#$communityname} dev bat0 diff --git a/files/l2tp_broker.cfg b/files/l2tp_broker.cfg index a741273..d38104e 100644 --- a/files/l2tp_broker.cfg +++ b/files/l2tp_broker.cfg @@ -4,7 +4,7 @@ address={{ ansible_default_ipv4.address }} ; Ports where the broker will listen on port={{ sn_l2tp_tb_port }} ; Interface with that IP address -interface=ens18 +interface={{ sn_interface_name }} ; Maximum number of cached cookies, required for establishing a ; session with the broker max_cookies=1024 @@ -21,7 +21,7 @@ pmtu_discovery=false ; Namespace (for running multiple brokers); note that you must also ; configure disjunct ports, and tunnel identifiers in order for ; namespacing to work -namespace=troisdorf +namespace={{ communityname }} ; Reject connections if there are less than N seconds since the last connection. ; Can be less than a second (e.g., 0.1).