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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos.package
Commits
e6fcf5d2
Commit
e6fcf5d2
authored
Jul 03, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use openvpn for windows in the re6stnet
parent
c8610155
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+15
-2
No files found.
windows/scripts/slapos-configure.sh
View file @
e6fcf5d2
...
...
@@ -519,6 +519,7 @@ if [[ ! -f re6stnet.conf ]] ; then
echo
"ovpnlog"
>>
re6stnet.conf
echo
"interface
$slapos_ifname
"
>>
re6stnet.conf
echo
"main-interface
$slapos_ifname
"
>>
re6stnet.conf
echo
"log
$(
cygpath
-m
/var/log/re6stnet
)
"
fi
[[
!
-f
re6stnet.conf
]]
&&
\
...
...
@@ -572,10 +573,20 @@ echo "Checking native IPv6 ..."
check_ipv6_connection
# Run re6stnet if no native ipv6
if
((
$?
))
;
then
echo
"No native IPv6."
re6stnet_script
=
/etc/re6stnet/ovpn-cygwin.bat
service_name
=
slapos-re6stnet
echo
No native IPv6.
echo
Check re6stnet network ...
which re6stnet
>
/dev/null 2>&1
||
show_error_exit
"Error: no re6stnet installed, please run Configure SlapOS first."
service_name
=
slapos-re6stnet
if
[[
!
-f
${
re6stnet_script
}
]]
;
then
cat
<<
EOF
> /
${
re6stnet_script
}
$(
cygpath
-w
/bin/bash.exe
)
--login -c 'python %*'
EOF
fi
chmod
+x
${
re6stnet_script
}
# re6st-conf --registry http://re6stnet.nexedi.com/ --is-needed
cygrunsrv
--query
$service_name
>
/dev/null 2>&1
if
((
$?
))
;
then
...
...
@@ -589,6 +600,7 @@ if (( $? )) ; then
# check_ipv6_connection && break
# done
fi
service_state
=
$(
cygrunsrv
--query
$service_name
|
sed
-n
-e
's/^Current State[ :]*//p'
)
if
[[
!
x
$service_state
==
"xRunning"
]]
;
then
echo
"Starting
$service_name
service ..."
...
...
@@ -596,6 +608,7 @@ if (( $? )) ; then
service_state
=
$(
cygrunsrv
--query
$service_name
|
sed
-n
-e
's/^Current State[ :]*//p'
)
fi
[[
x
$service_state
==
"xRunning"
]]
||
show_error_exit
"Failed to start
$service_name
service."
echo
Cygwin
$service_name
service is running.
echo
"You can check log files in the /var/log/re6stnet/*.log"
echo
...
...
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