Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
slapos.package
Commits
95d2b5d6
Commit
95d2b5d6
authored
Mar 12, 2013
by
Jean-Baptiste Petre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
5a5b6eb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
slapos-node/slapos-start
slapos-node/slapos-start
+2
-1
slapprepare/slapprepare/script/slapos
slapprepare/slapprepare/script/slapos
+5
-6
No files found.
slapos-node/slapos-start
View file @
95d2b5d6
...
@@ -31,7 +31,8 @@ if [ $ONLY_SLAPFORMAT = false ]; then
...
@@ -31,7 +31,8 @@ if [ $ONLY_SLAPFORMAT = false ]; then
# Launch re6stnet
# Launch re6stnet
if
[
-f
$SLAPOS_CONFIGURATION
/re6st-needed
]
;
then
if
[
-f
$SLAPOS_CONFIGURATION
/re6st-needed
]
;
then
/etc/init.d/re6stnet start
systemctl
enable
re6stnet.service
systemctl start re6stnet.service
sleep
10
sleep
10
fi
fi
...
...
slapprepare/slapprepare/script/slapos
View file @
95d2b5d6
...
@@ -38,7 +38,7 @@ done
...
@@ -38,7 +38,7 @@ done
IPV6CHECK
=
ipv6.google.com
IPV6CHECK
=
ipv6.google.com
IPV4CHECK
=
google.com
IPV4CHECK
=
google.com
IPV6WAITTIME
=
5
IPV6WAITTIME
=
5
SLAP
VPN
=
"ipv6_interface = lo"
SLAP
RE6STNET
=
"ipv6_interface = lo"
SLAPOS_CONFIGURATION
=
'%(slapos_configuration)s'
SLAPOS_CONFIGURATION
=
'%(slapos_configuration)s'
...
@@ -67,8 +67,7 @@ do
...
@@ -67,8 +67,7 @@ do
done
done
if
[
$?
!=
0
]
||
[
-f
$SLAPOS_CONFIGURATION
/openvpn-needed
]
;
then
if
[
$?
!=
0
]
||
[
-f
$SLAPOS_CONFIGURATION
/openvpn-needed
]
;
then
echo
""" Starting openVPN """
echo
""" Starting Re6stnet """
# /etc/init.d/openvpn start
service start re6stnet.service
service start re6stnet.service
sleep
10
sleep
10
ping6
-I
lo
-c
2
$IPV6CHECK
ping6
-I
lo
-c
2
$IPV6CHECK
...
@@ -76,13 +75,13 @@ if [ $? != 0 ] || [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then
...
@@ -76,13 +75,13 @@ if [ $? != 0 ] || [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then
ping6
-I
lo
-c
2
$IPV6CHECK
ping6
-I
lo
-c
2
$IPV6CHECK
done
done
# Ask slapos to use openvpn as ipv6 provider
# Ask slapos to use openvpn as ipv6 provider
sed
-i
"/
${
SLAP
VPN
}
/ s/# *//"
$SLAPOS_CONFIGURATION
/slapos.cfg
sed
-i
"/
${
SLAP
RE6STNET
}
/ s/# *//"
$SLAPOS_CONFIGURATION
/slapos.cfg
# Use tapVPN as default interface for ipv6 traffic
# 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
sleep
2
else
else
# OpenVPN not needed, comment line about he_ipv6 (if not ailready done)
# OpenVPN not needed, comment line about he_ipv6 (if not ailready done)
sed
-i
"/
${
SLAP
VPN
}
/ s/^
\(
[^#]
\)
/#
\1
/g"
$SLAPOS_CONFIGURATION
/slapos.cfg
sed
-i
"/
${
SLAP
RE6STNET
}
/ s/^
\(
[^#]
\)
/#
\1
/g"
$SLAPOS_CONFIGURATION
/slapos.cfg
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment