From 2c3c2955a29135ecc2a7920c9816bc8ccd0f9086 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Thu, 7 Jul 2016 22:48:58 +0200
Subject: streamlined systemd integration/installation

---
 usr/bin/anytun-launcher.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'usr/bin')

diff --git a/usr/bin/anytun-launcher.sh b/usr/bin/anytun-launcher.sh
index 8103f91..60773fd 100755
--- a/usr/bin/anytun-launcher.sh
+++ b/usr/bin/anytun-launcher.sh
@@ -2,12 +2,12 @@
 
 NAME="${NAME:-$2}"
 
-DAEMON=/usr/sbin/anytun
-ANYTUNCONFIG=/usr/bin/anytun-config
-CONTROLDAEMON=/usr/bin/anytun-controld
-CONFIG_DIR=/etc/anytun
-VARCONFIG_DIR=/run/anytun-controld
+DAEMON=/usr/local/sbin/anytun
+ANYTUNCONFIG=/usr/local/bin/anytun-config
+CONTROLDAEMON=/usr/local/bin/anytun-controld
+CONFIG_DIR=/usr/local/etc/anytun
 VARRUN_DIR=/run/anytun
+VARCONTROL_DIR=/run/anytun-controld
 
 test -x $DAEMON || exit 0
 test -z $NAME && exit 1
@@ -31,18 +31,18 @@ start_vpn () {
 
 start_configd () {
   if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
-    test -d $VARCONFIG_DIR || mkdir -p $VARCONFIG_DIR
-    chmod 700 $VARCONFIG_DIR
-    rm -f $VARCONFIG_DIR/$NAME 2>/dev/null
+    test -d $VARCONTROL_DIR || mkdir -p $VARCONTROL_DIR
+    chmod 700 $VARCONTROL_DIR
+    rm -f $VARCONTROL_DIR/$NAME 2>/dev/null
     KDPRF=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'kd-prf' | sed  's/^/ --/' | xargs echo`
     for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do
       echo -n " ($CLIENTNAME)"
       DAEMONARG=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed  's/^/ --/' | xargs echo`
-      $ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONFIG_DIR/$NAME
+      $ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONTROL_DIR/$NAME
     done
     CONTROLHOST=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed  's/^/ --/' | xargs echo`
-    $CONTROLDAEMON -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST \
-      --write-pid $VARCONFIG_DIR/$NAME.pid
+    $CONTROLDAEMON -f $VARCONTROL_DIR/$NAME $DAEMONOPTS $CONTROLHOST \
+      --write-pid $VARCONTROL_DIR/$NAME.pid
   else
     echo "no conf.d directory found (maybe $NAME is an anytun client not a server?)" >&2
     return 1
@@ -50,7 +50,13 @@ start_configd () {
 }
 
 case $1 in
-(vpn) start_vpn ;;
-(configd) start_configd ;;
-(*) exit 2;;
+  vpn)
+    start_vpn
+    ;;
+  configd)
+    start_configd
+    ;;
+  *)
+    exit 2
+    ;;
 esac
-- 
cgit v1.2.3