From 350e0088f50b046017f0654ecb0b9fdfaca679b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 26 Jan 2015 14:08:13 +0100
Subject: [PATCH] move default configuration to conf.d

---
 conf.d/default.conf |  5 +++++
 tinc-up             | 12 ------------
 2 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 conf.d/default.conf

diff --git a/conf.d/default.conf b/conf.d/default.conf
new file mode 100644
index 0000000..4f4ec8b
--- /dev/null
+++ b/conf.d/default.conf
@@ -0,0 +1,5 @@
+AutoConnect = yes
+MaxTimeout = 300
+Mode = switch
+ConnectTo = eve
+ConnectTo = eva
diff --git a/tinc-up b/tinc-up
index 6efd47d..4fa27d3 100755
--- a/tinc-up
+++ b/tinc-up
@@ -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