mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-08-26 12:46:08 +00:00
fixed indentions
This commit is contained in:
Daniel Steglich
parent
8e15511b44
commit
af22962bbe
@ -27,25 +27,25 @@ CRONJOB="/etc/cron.d/${TOOLNAME}"
|
|||||||
|
|
||||||
doReadCFG()
|
doReadCFG()
|
||||||
{
|
{
|
||||||
host=""
|
host=""
|
||||||
server=""
|
server=""
|
||||||
user=""
|
user=""
|
||||||
pass=""
|
pass=""
|
||||||
IPURL=""
|
IPURL=""
|
||||||
FILE=""
|
FILE=""
|
||||||
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
||||||
[ -f $CFG ] && FILE=$CFG
|
[ -f $CFG ] && FILE=$CFG
|
||||||
|
|
||||||
if [ ! -z $FILE ];then
|
if [ ! -z $FILE ];then
|
||||||
host=`cat $FILE 2> /dev/null |grep host |cut -d = -f 2`
|
host=`cat $FILE 2> /dev/null |grep host |cut -d = -f 2`
|
||||||
server=`cat $FILE 2> /dev/null |grep server |cut -d = -f 2`
|
server=`cat $FILE 2> /dev/null |grep server |cut -d = -f 2`
|
||||||
user=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1`
|
user=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1`
|
||||||
pass=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2`
|
pass=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z $HELPERCFG ];then
|
if [ ! -z $HELPERCFG ];then
|
||||||
IPURL=`cat $HELPERCFG 2> /dev/null |grep URL |awk '{print $2}'`
|
IPURL=`cat $HELPERCFG 2> /dev/null |grep URL |awk '{print $2}'`
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
doGetOpt()
|
doGetOpt()
|
||||||
@ -65,11 +65,11 @@ doGetOpt()
|
|||||||
pass=$OPTARG
|
pass=$OPTARG
|
||||||
;;
|
;;
|
||||||
I)
|
I)
|
||||||
if [ "$OPTARG" != "$EMPTYSTRING" ];then
|
if [ "$OPTARG" != "$EMPTYSTRING" ];then
|
||||||
IPURL=$OPTARG
|
IPURL=$OPTARG
|
||||||
else
|
else
|
||||||
IPURL=""
|
IPURL=""
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
\?)
|
\?)
|
||||||
echo "Invalid option: -$OPTARG" >&2
|
echo "Invalid option: -$OPTARG" >&2
|
||||||
@ -85,63 +85,63 @@ doGetOpt()
|
|||||||
|
|
||||||
doWriteCFG()
|
doWriteCFG()
|
||||||
{
|
{
|
||||||
#always write to the inactive config - needs to be enabled vi "start" command later
|
#always write to the inactive config - needs to be enabled vi "start" command later
|
||||||
FILE=$CFG_disabled
|
FILE=$CFG_disabled
|
||||||
|
|
||||||
#reset the last update time
|
#reset the last update time
|
||||||
echo 0 > $LASTUPDATE
|
echo 0 > $LASTUPDATE
|
||||||
|
|
||||||
#reset the last updated IP
|
#reset the last updated IP
|
||||||
echo "0.0.0.0" > $IPFILE
|
echo "0.0.0.0" > $IPFILE
|
||||||
|
|
||||||
#reset last update
|
#reset last update
|
||||||
rm $STATUSFILE
|
rm $STATUSFILE
|
||||||
|
|
||||||
#find the interface (always the default gateway interface)
|
#find the interface (always the default gateway interface)
|
||||||
DEFAULT=`ip route |grep default |awk '{print $5}'`
|
DEFAULT=`ip route |grep default |awk '{print $5}'`
|
||||||
|
|
||||||
#store the given options in ez-ipupdate compatible config file
|
#store the given options in ez-ipupdate compatible config file
|
||||||
echo "host=$host" > $FILE
|
echo "host=$host" > $FILE
|
||||||
echo "server=$server" >> $FILE
|
echo "server=$server" >> $FILE
|
||||||
echo "user=${user}:${pass}" >> $FILE
|
echo "user=${user}:${pass}" >> $FILE
|
||||||
echo "service-type=gnudip" >> $FILE
|
echo "service-type=gnudip" >> $FILE
|
||||||
echo "retrys=5" >> $FILE
|
echo "retrys=5" >> $FILE
|
||||||
echo "execute=$0 success" >> $FILE
|
echo "execute=$0 success" >> $FILE
|
||||||
echo "wildcard" >> $FILE
|
echo "wildcard" >> $FILE
|
||||||
|
|
||||||
#check if we are behind a NAT Router
|
#check if we are behind a NAT Router
|
||||||
echo "IPURL $IPURL" > $HELPERCFG
|
echo "IPURL $IPURL" > $HELPERCFG
|
||||||
if [ -z $IPURL ];then
|
if [ -z $IPURL ];then
|
||||||
echo "NAT unknown" >> $HELPERCFG
|
echo "NAT unknown" >> $HELPERCFG
|
||||||
else
|
else
|
||||||
doGetWANIP
|
doGetWANIP
|
||||||
ISGLOBAL=`ip addr ls $DEFAULT | grep $WANIP`
|
ISGLOBAL=`ip addr ls $DEFAULT | grep $WANIP`
|
||||||
if [ -z $ISGLOBAL ];then
|
if [ -z $ISGLOBAL ];then
|
||||||
#we are behind NAT
|
#we are behind NAT
|
||||||
echo "NAT yes" >> $HELPERCFG
|
echo "NAT yes" >> $HELPERCFG
|
||||||
else
|
else
|
||||||
#we are directly connected
|
#we are directly connected
|
||||||
echo "NAT no" >> $HELPERCFG
|
echo "NAT no" >> $HELPERCFG
|
||||||
#if this file is added ez-ipupdate will take ip form this interface
|
#if this file is added ez-ipupdate will take ip form this interface
|
||||||
echo "interface=$DEFAULT" >> $FILE
|
echo "interface=$DEFAULT" >> $FILE
|
||||||
#if this line is added to config file, ez-ipupdate will be launched on startup via init.d
|
#if this line is added to config file, ez-ipupdate will be launched on startup via init.d
|
||||||
echo "daemon" >> $FILE
|
echo "daemon" >> $FILE
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
doGetWANIP()
|
doGetWANIP()
|
||||||
{
|
{
|
||||||
if [ $IPURL ];then
|
if [ $IPURL ];then
|
||||||
OUTFILE=`mktemp`
|
OUTFILE=`mktemp`
|
||||||
wget -4 -o /dev/null -O $OUTFILE $IPURL
|
wget -4 -o /dev/null -O $OUTFILE $IPURL
|
||||||
WANIP=`cat $OUTFILE`
|
WANIP=`cat $OUTFILE`
|
||||||
rm $OUTFILE
|
rm $OUTFILE
|
||||||
else
|
else
|
||||||
#no WAN IP found because of missing check URL
|
#no WAN IP found because of missing check URL
|
||||||
WANIP=${NOIP}
|
WANIP=${NOIP}
|
||||||
fi
|
fi
|
||||||
echo $WANIP > $IPFILE
|
echo $WANIP > $IPFILE
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd=$1
|
cmd=$1
|
||||||
@ -153,67 +153,67 @@ case $cmd in
|
|||||||
;;
|
;;
|
||||||
start)
|
start)
|
||||||
if [ "$(cat $HELPERCFG |grep ^NAT | awk '{print $2}')" = "no" ];then
|
if [ "$(cat $HELPERCFG |grep ^NAT | awk '{print $2}')" = "no" ];then
|
||||||
mv $CFG_disabled $CFG
|
mv $CFG_disabled $CFG
|
||||||
/etc/init.d/${TOOLNAME} start
|
/etc/init.d/${TOOLNAME} start
|
||||||
else
|
else
|
||||||
echo "*/${UPDATEMINUTES} * * * * root $0 update" > $CRONJOB
|
echo "*/${UPDATEMINUTES} * * * * root $0 update" > $CRONJOB
|
||||||
$0 update
|
$0 update
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
get-nat)
|
get-nat)
|
||||||
NAT=`cat $HELPERCFG 2> /dev/null |grep ^NAT | awk '{print $2}'`
|
NAT=`cat $HELPERCFG 2> /dev/null |grep ^NAT | awk '{print $2}'`
|
||||||
[ -z $NAT ] && NAT="unknown"
|
[ -z $NAT ] && NAT="unknown"
|
||||||
echo $NAT
|
echo $NAT
|
||||||
|
;;
|
||||||
|
update)
|
||||||
|
doReadCFG
|
||||||
|
OLDIP=`cat $IPFILE`
|
||||||
|
doGetWANIP
|
||||||
|
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
||||||
|
[ -f $CFG ] && FILE=$CFG
|
||||||
|
RESULT=0
|
||||||
|
#if we know our WAN IP, only update if IP changes
|
||||||
|
if [ "$OLDIP" != "$WANIP" -a "${WANIP}" != ${NOIP} ];then
|
||||||
|
${UPDATE_TOOL} -c $FILE
|
||||||
|
RESULT=$?
|
||||||
|
cat /proc/uptime |awk '{print $1}' > $LASTUPDATE
|
||||||
|
fi
|
||||||
|
#if we don't know our WAN IP do a blind update once a hour
|
||||||
|
if [ "${WANIP}" = ${NOIP} ];then
|
||||||
|
UPTIME=`cat /proc/uptime`
|
||||||
|
LAST=`cat $LASTUPDATE`
|
||||||
|
DIFF=`expr $UPTIME - $LAST`
|
||||||
|
if [ $DIFF -gt $UPDATEMINUTESUNKNOWN ];then
|
||||||
|
${UPDATE_TOOL} -c $FILE
|
||||||
|
RESULT=$?
|
||||||
|
cat /proc/uptime |awk '{print $1}' > $LASTUPDATE
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [ $RESULT -eq 0 ];then
|
||||||
|
$0 success
|
||||||
|
else
|
||||||
|
$0 failed
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
update)
|
|
||||||
doReadCFG
|
|
||||||
OLDIP=`cat $IPFILE`
|
|
||||||
doGetWANIP
|
|
||||||
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
|
||||||
[ -f $CFG ] && FILE=$CFG
|
|
||||||
RESULT=0
|
|
||||||
#if we know our WAN IP, only update if IP changes
|
|
||||||
if [ "$OLDIP" != "$WANIP" -a "${WANIP}" != ${NOIP} ];then
|
|
||||||
${UPDATE_TOOL} -c $FILE
|
|
||||||
RESULT=$?
|
|
||||||
cat /proc/uptime |awk '{print $1}' > $LASTUPDATE
|
|
||||||
fi
|
|
||||||
#if we don't know our WAN IP do a blind update once a hour
|
|
||||||
if [ "${WANIP}" = ${NOIP} ];then
|
|
||||||
UPTIME=`cat /proc/uptime`
|
|
||||||
LAST=`cat $LASTUPDATE`
|
|
||||||
DIFF=`expr $UPTIME - $LAST`
|
|
||||||
if [ $DIFF -gt $UPDATEMINUTESUNKNOWN ];then
|
|
||||||
${UPDATE_TOOL} -c $FILE
|
|
||||||
RESULT=$?
|
|
||||||
cat /proc/uptime |awk '{print $1}' > $LASTUPDATE
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ $RESULT -eq 0 ];then
|
|
||||||
$0 success
|
|
||||||
else
|
|
||||||
$0 failed
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
stop)
|
stop)
|
||||||
rm $CRONJOB 2> /dev/null
|
rm $CRONJOB 2> /dev/null
|
||||||
/etc/init.d/${TOOLNAME} stop
|
/etc/init.d/${TOOLNAME} stop
|
||||||
mv $CFG $CFG_disabled
|
mv $CFG $CFG_disabled
|
||||||
;;
|
;;
|
||||||
success)
|
success)
|
||||||
DATE=`date`
|
DATE=`date`
|
||||||
echo "last update done ($DATE)" > $STATUSFILE
|
echo "last update done ($DATE)" > $STATUSFILE
|
||||||
;;
|
;;
|
||||||
failed)
|
failed)
|
||||||
DATE=`date`
|
DATE=`date`
|
||||||
echo "last update failed ($DATE)" > $STATUSFILE
|
echo "last update failed ($DATE)" > $STATUSFILE
|
||||||
;;
|
;;
|
||||||
get-last-success)
|
get-last-success)
|
||||||
if [ -f $STATUSFILE ];then
|
if [ -f $STATUSFILE ];then
|
||||||
cat $STATUSFILE
|
cat $STATUSFILE
|
||||||
else
|
else
|
||||||
echo "no update recorded since last config change"
|
echo "no update recorded since last config change"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
get-installed)
|
get-installed)
|
||||||
if [ ! -z ${UPDATE_TOOL} ];then
|
if [ ! -z ${UPDATE_TOOL} ];then
|
||||||
@ -226,8 +226,8 @@ case $cmd in
|
|||||||
if [ -f $CRONJOB ];then
|
if [ -f $CRONJOB ];then
|
||||||
echo enabled
|
echo enabled
|
||||||
elif [ ! -z $PROC ];then
|
elif [ ! -z $PROC ];then
|
||||||
echo enabled
|
echo enabled
|
||||||
else
|
else
|
||||||
echo disabled
|
echo disabled
|
||||||
fi
|
fi
|
||||||
echo $server
|
echo $server
|
||||||
@ -237,10 +237,10 @@ case $cmd in
|
|||||||
echo $IPURL
|
echo $IPURL
|
||||||
;;
|
;;
|
||||||
get-timer)
|
get-timer)
|
||||||
echo $UPDATEMINUTES
|
echo $UPDATEMINUTES
|
||||||
;;
|
;;
|
||||||
clean)
|
clean)
|
||||||
rm ${CFGDIR}/*
|
rm ${CFGDIR}/*
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "usage: get-installed|status|configure <options>|start|stop|update|get-nat|clean|success|failed"
|
echo "usage: get-installed|status|configure <options>|start|stop|update|get-nat|clean|success|failed"
|
||||||
@ -252,10 +252,10 @@ case $cmd in
|
|||||||
echo "-p <password> Account Password"
|
echo "-p <password> Account Password"
|
||||||
echo "-I <IP check URL> A URL which returns the IP of the client who is requesting"
|
echo "-I <IP check URL> A URL which returns the IP of the client who is requesting"
|
||||||
echo ""
|
echo ""
|
||||||
echo "update do a one time update"
|
echo "update do a one time update"
|
||||||
echo "clean delete configuration"
|
echo "clean delete configuration"
|
||||||
echo "success store update success"
|
echo "success store update success"
|
||||||
echo "failed store update failure"
|
echo "failed store update failure"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user