From 7b3c99c01457c6971f9ed2111b0c6618dff1ad58 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Sat, 5 Dec 2009 16:30:30 +0000 Subject: changed indent to spaces because Tommy[D] requested it so --- .../net-misc/anytun/files/anytun-0.3.1.init | 226 ++++++++++----------- .../net-misc/uanytun/files/uanytun-0.3.1.init | 116 +++++------ 2 files changed, 171 insertions(+), 171 deletions(-) (limited to 'gentoo-linux/net-misc') diff --git a/gentoo-linux/net-misc/anytun/files/anytun-0.3.1.init b/gentoo-linux/net-misc/anytun/files/anytun-0.3.1.init index 2fa1473..188bf0d 100755 --- a/gentoo-linux/net-misc/anytun/files/anytun-0.3.1.init +++ b/gentoo-linux/net-misc/anytun/files/anytun-0.3.1.init @@ -4,9 +4,9 @@ opts="${opts} reload" depend() { - need net - use dns - after bootmisc + need net + use dns + after bootmisc } DAEMON=/usr/sbin/anytun @@ -23,136 +23,136 @@ VPN=${SVCNAME#*.} # Include anytun defaults if available if [ -f /etc/default/anytun ] ; then - . /etc/default/anytun + . /etc/default/anytun fi test -x $DAEMON || exit 1 start_vpn () { - if [ -f $CONFIG_DIR/$NAME/config ] ; then - POSTUP='' - test -f $CONFIG_DIR/$NAME/post-up.sh && POSTUP="-x $CONFIG_DIR/$NAME/post-up.sh" - CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$NAME/config | sed 's/chroot\s*//'` - if [ -n "$CHROOTDIR" ] ; then - test -d $CHROOTDIR || mkdir -p $CHROOTDIR - fi - test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR - DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '` - start-stop-daemon --start --pidfile $VARRUN_DIR/${NAME}.pid --exec $DAEMON -- --write-pid $VARRUN_DIR/${NAME}.pid $POSTUP \ - $DAEMONOPTS $DAEMONARG || return 1 - else - eerror "no config found" - return 1 - fi - start_configd - return 0 + if [ -f $CONFIG_DIR/$NAME/config ] ; then + POSTUP='' + test -f $CONFIG_DIR/$NAME/post-up.sh && POSTUP="-x $CONFIG_DIR/$NAME/post-up.sh" + CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$NAME/config | sed 's/chroot\s*//'` + if [ -n "$CHROOTDIR" ] ; then + test -d $CHROOTDIR || mkdir -p $CHROOTDIR + fi + test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR + DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '` + start-stop-daemon --start --pidfile $VARRUN_DIR/${NAME}.pid --exec $DAEMON -- --write-pid $VARRUN_DIR/${NAME}.pid $POSTUP \ + $DAEMONOPTS $DAEMONARG || return 1 + else + eerror "no config found" + return 1 + fi + start_configd + return 0 } stop_vpn () { - start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo - rm -f $PIDFILE - stop_configd + start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo + rm -f $PIDFILE + stop_configd } 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 - for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do - DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed 's/^/ --/' | xargs echo` - $ANYTUNCONFIG $DAEMONARG >> $VARCONFIG_DIR/$NAME - done - CONTROLHOST=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed 's/^/ --/'` - start-stop-daemon --start --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON \ - -- -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST --write-pid $VARCONFIG_DIR/${NAME}.pid - fi + 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 + for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do + DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed 's/^/ --/' | xargs echo` + $ANYTUNCONFIG $DAEMONARG >> $VARCONFIG_DIR/$NAME + done + CONTROLHOST=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed 's/^/ --/'` + start-stop-daemon --start --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON \ + -- -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST --write-pid $VARCONFIG_DIR/${NAME}.pid + fi } stop_configd () { - if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then - start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON --oknodo - rm -f $VARCONFIG_DIR/${NAME}.pid - fi + if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then + start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON --oknodo + rm -f $VARCONFIG_DIR/${NAME}.pid + fi } start () { - if test -z "$VPN" ; then - if [ -f $CONFIG_DIR/autostart ] ; then - for NAME in `sed 's/#.*//' < $CONFIG_DIR/autostart | grep -e '\w'`; do - ebegin "Starting ${DESC} VPN: ${NAME}" - start_vpn - eend $? - done - else - eerror "no config found" - return 1; - fi - else - NAME="$VPN" - ebegin "Starting ${DESC} VPN: ${NAME}" - start_vpn - eend $? - fi + if test -z "$VPN" ; then + if [ -f $CONFIG_DIR/autostart ] ; then + for NAME in `sed 's/#.*//' < $CONFIG_DIR/autostart | grep -e '\w'`; do + ebegin "Starting ${DESC} VPN: ${NAME}" + start_vpn + eend $? + done + else + eerror "no config found" + return 1; + fi + else + NAME="$VPN" + ebegin "Starting ${DESC} VPN: ${NAME}" + start_vpn + eend $? + fi } stop () { - if test -z "$VPN" ; then - for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c17-` - NAME=${NAME%%.pid} - ebegin "Stopping ${DESC} VPN: ${NAME}" - stop_vpn - eend $? - done - else - if test -e $VARRUN_DIR/${VPN}.pid ; then - PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` - NAME=`echo $PIDFILE | cut -c17-` - NAME=${NAME%%.pid} - ebegin "Stopping ${DESC} VPN: ${NAME}" - stop_vpn - eend $? - else - eerror " failure: No such tunnel is running: $VPN" - fi - fi + if test -z "$VPN" ; then + for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do + NAME=`echo $PIDFILE | cut -c17-` + NAME=${NAME%%.pid} + ebegin "Stopping ${DESC} VPN: ${NAME}" + stop_vpn + eend $? + done + else + if test -e $VARRUN_DIR/${VPN}.pid ; then + PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` + NAME=`echo $PIDFILE | cut -c17-` + NAME=${NAME%%.pid} + ebegin "Stopping ${DESC} VPN: ${NAME}" + stop_vpn + eend $? + else + eerror " failure: No such tunnel is running: $VPN" + fi + fi } reload () { - if test -z "$VPN" ; then - for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c17-` - NAME=${NAME%%.pid} - if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then - ebegin "Reloading ${DESC} VPN: ${NAME}" - stop_vpn - start_vpn - eend $? - else - ebegin "Reloading ${DESC} VPN: ${NAME}" - stop_configd - start_configd - eend $? - fi - done - else - if test -e $VARRUN_DIR/${VPN}.pid ; then - PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` - NAME=`echo $PIDFILE | cut -c17-` - NAME=${NAME%%.pid} - if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then - ebegin "Reloading ${DESC} VPN: ${NAME}" - stop_vpn - start_vpn - eend $? - else - ebegin "Reloading ${DESC} VPN: ${NAME}" - stop_configd - start_configd - eend $? - fi - else - eerror "failure: No such tunnel is running: $VPN" - fi - fi + if test -z "$VPN" ; then + for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do + NAME=`echo $PIDFILE | cut -c17-` + NAME=${NAME%%.pid} + if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then + ebegin "Reloading ${DESC} VPN: ${NAME}" + stop_vpn + start_vpn + eend $? + else + ebegin "Reloading ${DESC} VPN: ${NAME}" + stop_configd + start_configd + eend $? + fi + done + else + if test -e $VARRUN_DIR/${VPN}.pid ; then + PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` + NAME=`echo $PIDFILE | cut -c17-` + NAME=${NAME%%.pid} + if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then + ebegin "Reloading ${DESC} VPN: ${NAME}" + stop_vpn + start_vpn + eend $? + else + ebegin "Reloading ${DESC} VPN: ${NAME}" + stop_configd + start_configd + eend $? + fi + else + eerror "failure: No such tunnel is running: $VPN" + fi + fi } diff --git a/gentoo-linux/net-misc/uanytun/files/uanytun-0.3.1.init b/gentoo-linux/net-misc/uanytun/files/uanytun-0.3.1.init index 4a4aaa3..9f82a6d 100755 --- a/gentoo-linux/net-misc/uanytun/files/uanytun-0.3.1.init +++ b/gentoo-linux/net-misc/uanytun/files/uanytun-0.3.1.init @@ -3,9 +3,9 @@ # Written by Bernhard Tittelbach based on examples from Gentoo, openvpn and uanytun debian initrd script depend() { - need net - use dns - after bootmisc + need net + use dns + after bootmisc } DAEMON=/usr/sbin/uanytun @@ -21,70 +21,70 @@ test -x $DAEMON || exit 1 # Include uanytun defaults if available if [ -f /etc/default/uanytun ] ; then - . /etc/default/uanytun + . /etc/default/uanytun fi start_vpn () { - if [ -f $CONFIG_DIR/$NAME/config ] ; then - POSTUP='' - test -f $CONFIG_DIR/$NAME/post-up.sh && POSTUP="-x $CONFIG_DIR/$NAME/post-up.sh" - CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$NAME/config | sed 's/chroot\s*//'` - if [ -n "$CHROOTDIR" ] ; then - test -d $CHROOTDIR || mkdir -p $CHROOTDIR - fi - DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '` - start-stop-daemon --start --pidfile $VARRUN_PREFIX.${NAME}.pid --exec \ - $DAEMON -- --write-pid $VARRUN_PREFIX.${NAME}.pid $POSTUP $DAEMONARG || return 1 - else - eerror "no config found" - return 1 - fi - return 0 + if [ -f $CONFIG_DIR/$NAME/config ] ; then + POSTUP='' + test -f $CONFIG_DIR/$NAME/post-up.sh && POSTUP="-x $CONFIG_DIR/$NAME/post-up.sh" + CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$NAME/config | sed 's/chroot\s*//'` + if [ -n "$CHROOTDIR" ] ; then + test -d $CHROOTDIR || mkdir -p $CHROOTDIR + fi + DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '` + start-stop-daemon --start --pidfile $VARRUN_PREFIX.${NAME}.pid --exec \ + $DAEMON -- --write-pid $VARRUN_PREFIX.${NAME}.pid $POSTUP $DAEMONARG || return 1 + else + eerror "no config found" + return 1 + fi + return 0 } stop_vpn () { - start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo - rm -f $PIDFILE + start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo + rm -f $PIDFILE } start () { - if test -z "$VPN" ; then - if [ -f $CONFIG_DIR/autostart ] ; then - for NAME in `sed 's/#.*//' < $CONFIG_DIR/autostart | grep -e '\w'`; do - ebegin "Starting ${DESC} VPN: ${NAME}" - start_vpn - eend $? - done - else - eerror "no config found" - return 1 - fi - else - NAME="$VPN" - ebegin "Starting ${DESC} VPN: ${NAME}" - start_vpn - eend $? - fi + if test -z "$VPN" ; then + if [ -f $CONFIG_DIR/autostart ] ; then + for NAME in `sed 's/#.*//' < $CONFIG_DIR/autostart | grep -e '\w'`; do + ebegin "Starting ${DESC} VPN: ${NAME}" + start_vpn + eend $? + done + else + eerror "no config found" + return 1 + fi + else + NAME="$VPN" + ebegin "Starting ${DESC} VPN: ${NAME}" + start_vpn + eend $? + fi } stop () { - if test -z "$VPN" ; then - for PIDFILE in `ls $VARRUN_PREFIX.*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - ebegin "Stopping ${DESC} VPN: ${NAME}" - stop_vpn - eend $? - done - else - if test -e $VARRUN_PREFIX.${VPN}.pid ; then - PIDFILE=`ls $VARRUN_PREFIX.${VPN}.pid 2> /dev/null` - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - ebegin "Stopping ${DESC} VPN: ${NAME}" - stop_vpn - eend $? - else - eerror " failure: No such tunnel is running: $VPN" - fi - fi + if test -z "$VPN" ; then + for PIDFILE in `ls $VARRUN_PREFIX.*.pid 2> /dev/null`; do + NAME=`echo $PIDFILE | cut -c18-` + NAME=${NAME%%.pid} + ebegin "Stopping ${DESC} VPN: ${NAME}" + stop_vpn + eend $? + done + else + if test -e $VARRUN_PREFIX.${VPN}.pid ; then + PIDFILE=`ls $VARRUN_PREFIX.${VPN}.pid 2> /dev/null` + NAME=`echo $PIDFILE | cut -c18-` + NAME=${NAME%%.pid} + ebegin "Stopping ${DESC} VPN: ${NAME}" + stop_vpn + eend $? + else + eerror " failure: No such tunnel is running: $VPN" + fi + fi } -- cgit v1.2.3