From b5594710b27c5e5dc894e19e7236b0b6c687b083 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Wed, 5 Sep 2018 13:02:16 +0300
Subject: setup-dmvpn: support reconfiguration

---
 setup-dmvpn | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3