move default configuration to conf.d

This commit is contained in:
Jörg Thalheim 2015-01-26 14:08:13 +01:00
parent 629e47c2b4
commit 350e0088f5
2 changed files with 5 additions and 12 deletions

5
conf.d/default.conf Normal file
View File

@ -0,0 +1,5 @@
AutoConnect = yes
MaxTimeout = 300
Mode = switch
ConnectTo = eve
ConnectTo = eva

12
tinc-up
View File

@ -117,10 +117,6 @@ SUBNET=""
DHCP="yes"
IPV6_PRIVACY="yes"
TINC_AUTOCONNECT="yes"
TINC_TIMEOUT="300"
INITIAL_NODES=(eve eva)
source "${TINCRC}" || true
if [ -z "$MAC_ADDRESS" ]; then
@ -146,12 +142,4 @@ if [[ "${IPV6_PRIVACY,,}" != "yes" ]]; then
disable_ipv6_privacy "$INTERFACE"
fi
tinc -c "$DIR" set AutoConnect "$TINC_AUTOCONNECT"
tinc -c "$DIR" set MaxTimeout "$TINC_TIMEOUT"
tinc -c "$DIR" set Mode switch
for node in $INITIAL_NODES; do
tinc -c "$DIR" set ConnectTo "$node"
done
[ -x "$LOCAL_HOOK_FILE" ] && "$LOCAL_HOOK_FILE" || true