Commit 95d2b5d6 authored by Jean-Baptiste Petre's avatar Jean-Baptiste Petre

debug

parent 5a5b6eb6
......@@ -31,7 +31,8 @@ if [ $ONLY_SLAPFORMAT = false ]; then
# Launch re6stnet
if [ -f $SLAPOS_CONFIGURATION/re6st-needed ]; then
/etc/init.d/re6stnet start
systemctl enable re6stnet.service
systemctl start re6stnet.service
sleep 10
fi
......
......@@ -38,7 +38,7 @@ done
IPV6CHECK=ipv6.google.com
IPV4CHECK=google.com
IPV6WAITTIME=5
SLAPVPN="ipv6_interface = lo"
SLAPRE6STNET="ipv6_interface = lo"
SLAPOS_CONFIGURATION='%(slapos_configuration)s'
......@@ -67,8 +67,7 @@ do
done
if [ $? != 0 ] || [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then
echo """ Starting openVPN """
# /etc/init.d/openvpn start
echo """ Starting Re6stnet """
service start re6stnet.service
sleep 10
ping6 -I lo -c 2 $IPV6CHECK
......@@ -76,13 +75,13 @@ if [ $? != 0 ] || [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then
ping6 -I lo -c 2 $IPV6CHECK
done
# Ask slapos to use openvpn as ipv6 provider
sed -i "/${SLAPVPN}/ s/# *//" $SLAPOS_CONFIGURATION/slapos.cfg
sed -i "/${SLAPRE6STNET}/ s/# *//" $SLAPOS_CONFIGURATION/slapos.cfg
# Use tapVPN as default interface for ipv6 traffic
/sbin/ip -6 route del default dev br0
# /sbin/ip -6 route del default dev br0
sleep 2
else
# OpenVPN not needed, comment line about he_ipv6 (if not ailready done)
sed -i "/${SLAPVPN}/ s/^\([^#]\)/#\1/g" $SLAPOS_CONFIGURATION/slapos.cfg
sed -i "/${SLAPRE6STNET}/ s/^\([^#]\)/#\1/g" $SLAPOS_CONFIGURATION/slapos.cfg
fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment