freifunk/icvpn
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

post-merge: prefer the tinc1.1 cli over invoke-rc.d if it exists

Browse source
This commit is contained in:
Martin Weinelt 2015-05-11 15:15:14 +02:00
commit f46ef57b5e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/post-merge
View file

@ -7,6 +7,8 @@
# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/" # 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
# #
PATH=/usr/sbin:$PATH
fail() { fail() {
echo "$1" >&2 echo "$1" >&2
exit 1 exit 1
@ -25,6 +27,11 @@ while read HOST; do
echo "ConnectTo = $HOST" >> $TINCCFG echo "ConnectTo = $HOST" >> $TINCCFG
done < metanodes done < metanodes
/usr/sbin/invoke-rc.d tinc reload icvpn if hash tinc; then
# prefer the command line interface that comes with tinc1.1 if it exists
tinc -n icvpn reload
else
invoke-rc.d tinc reload icvpn
fi
exit 0 exit 0