Merge branch 'frosty-geek-feature_auto_conf'
This commit is contained in:
commit
81640df37d
32
scripts/post-merge
Normal file → Executable file
32
scripts/post-merge
Normal file → Executable file
|
@ -1,10 +1,30 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# post-merge hook für Debian um tinc zu reloaden
|
# post-merge hook for Debian systems
|
||||||
|
#
|
||||||
|
# 1. copy to .git/hooks
|
||||||
|
# 2. to test run "git pull -q"
|
||||||
|
# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
|
||||||
#
|
#
|
||||||
# 1. nach .git/hooks kopieren
|
|
||||||
# 2. git pull -q ausführen zum testen
|
|
||||||
# 3. cronjob erstellen, der git pull -q im richtigen
|
|
||||||
# Verzeichnis ausführt
|
|
||||||
|
|
||||||
/etc/init.d/tinc reload icvpn
|
fail() {
|
||||||
|
echo "$1" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
BASE=$(git rev-parse --show-toplevel)
|
||||||
|
TINCCFG=$BASE/tinc.conf
|
||||||
|
test -w $TINCCFG || fail "ERR: $TINCCFG is not writeable"
|
||||||
|
|
||||||
|
sed -i '/^ConnectTo/d' $TINCCFG
|
||||||
|
|
||||||
|
for HOST in hosts/*; do
|
||||||
|
# skip hosts without address
|
||||||
|
grep -q '^Address' -- "$HOST" || continue
|
||||||
|
|
||||||
|
echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
|
||||||
|
done
|
||||||
|
|
||||||
|
invoke-rc.d tinc reload icvpn
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
|
Loading…
Reference in a new issue