aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-09-05 13:02:16 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-09-05 13:02:16 +0300
commitb5594710b27c5e5dc894e19e7236b0b6c687b083 (patch)
tree067806bc1ecb8682bba9a03a913ed840e1e23e7c
parent6349b6057505c321a09e58b9851eb9790553e1e8 (diff)
downloaddmvpn-tools-b5594710b27c5e5dc894e19e7236b0b6c687b083.tar.bz2
dmvpn-tools-b5594710b27c5e5dc894e19e7236b0b6c687b083.tar.xz
setup-dmvpn: support reconfigurationv0.5.0
-rwxr-xr-xsetup-dmvpn11
1 files changed, 10 insertions, 1 deletions
diff --git a/setup-dmvpn b/setup-dmvpn
index 1b5a79b..bcc5021 100755
--- a/setup-dmvpn
+++ b/setup-dmvpn
@@ -50,8 +50,12 @@ get_local_dev() {
ip route list table local | get_dev local $1
}
+is_active() {
+ rc-service $1 status > /dev/null
+}
+
enable_service() {
- if rc-service $1 status > /dev/null; then
+ if is_active $1; then
rc-service $1 restart
else
rc-update add $1
@@ -132,6 +136,7 @@ EOF
[ "$GRE_IPV6_ADDRESS" ] && get_nhrp_config ipv6
cat <<EOF
exit
+ no router bgp $AS_NUMBER
router bgp $AS_NUMBER
EOF
get_config_cmds network $IPV4_PREFIXES
@@ -225,6 +230,10 @@ set /files/etc/conf.d/nhrpd/rc_need '"charon nhrp-events"'
set /files/etc/strongswan.d/charon.conf/charon/x509/enforce_critical no
EOF
+for serv in charon zebra; do
+ is_active $serv && rc-service $serv stop
+done
+
for serv in bgpd nhrpd zebra; do
file=/etc/quagga/$serv.conf
touch $file