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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos.package
Commits
48aabca1
Commit
48aabca1
authored
Jul 04, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No windows openvpn, it doesn't work to run the script.
parent
53f1d59f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
13 deletions
+3
-13
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+3
-12
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+0
-1
No files found.
windows/scripts/slapos-configure.sh
View file @
48aabca1
...
@@ -207,7 +207,7 @@ echo " interface name: $slapos_ifname"
...
@@ -207,7 +207,7 @@ echo " interface name: $slapos_ifname"
echo
" GUID:
$interface_guid
"
echo
" GUID:
$interface_guid
"
echo
" ipv4_local_network:
$ipv4_local_network
"
echo
" ipv4_local_network:
$ipv4_local_network
"
echo
" computer_id:
$computer_guid
"
echo
" computer_id:
$computer_guid
"
echo
echo
echo
" If ipv4_local_network confilcts with your local network, change it"
echo
" If ipv4_local_network confilcts with your local network, change it"
echo
" in the file:
$node_configure_file
"
echo
" in the file:
$node_configure_file
"
echo
" Or change it in the
$(
dirname
$0
)
/slapos-include.sh"
echo
" Or change it in the
$(
dirname
$0
)
/slapos-include.sh"
...
@@ -334,23 +334,14 @@ if [[ ! -r $re6stnet_configure_file ]] ; then
...
@@ -334,23 +334,14 @@ if [[ ! -r $re6stnet_configure_file ]] ; then
echo
" ovpnlog"
echo
" ovpnlog"
echo
" main-interface
$slapos_ifname
"
echo
" main-interface
$slapos_ifname
"
echo
" interface
$slapos_ifname
"
echo
" interface
$slapos_ifname
"
echo
" log
$(
cygpath
-m
/var/log/re6stnet
)
"
echo
-e
"#
$subnet
\n
table 0
\n
ovpnlog"
\
echo
-e
"#
$subnet
\n
table 0
\n
ovpnlog"
\
"
\n
main-interface
$slapos_ifname
\n
interface
$slapos_ifname
"
\
"
\n
main-interface
$slapos_ifname
\n
interface
$slapos_ifname
"
\
"
\n
log
$(
cygpath
-m
/var/log/re6stnet
)
"
\
>>
$re6stnet_configure_file
>>
$re6stnet_configure_file
fi
fi
# Run re6stnet if no native ipv6
# Run re6stnet if no native ipv6
if
check_re6stnet_needed
;
then
if
check_re6stnet_needed
;
then
check_re6stnet_configure
||
exit
1
check_re6stnet_configure
||
exit
1
if
[[
!
-r
$re6stnet_cygwin_script
]]
;
then
cat
<<
EOF
>
$re6stnet_cygwin_script
$(
cygpath
-w
/bin/bash.exe
)
--login -c 'python %*'
EOF
chmod
+x
$re6stnet_cygwin_script
fi
if
!
cygrunsrv
--query
$re6stnet_service_name
>
/dev/null 2>&1
;
then
if
!
cygrunsrv
--query
$re6stnet_service_name
>
/dev/null 2>&1
;
then
cygrunsrv
-I
$re6stnet_service_name
-c
$(
dirname
$re6stnet_configure_file
)
\
cygrunsrv
-I
$re6stnet_service_name
-c
$(
dirname
$re6stnet_configure_file
)
\
-p
$(
which re6stnet
)
-a
"@re6stnet.conf"
-d
"CYGWIN re6stnet"
||
\
-p
$(
which re6stnet
)
-a
"@re6stnet.conf"
-d
"CYGWIN re6stnet"
||
\
...
@@ -369,7 +360,7 @@ echo
...
@@ -369,7 +360,7 @@ echo
# -----------------------------------------------------------
# -----------------------------------------------------------
# taps: Install openvpn tap-windows drivers used by re6stnet
# taps: Install openvpn tap-windows drivers used by re6stnet
# -----------------------------------------------------------
# -----------------------------------------------------------
#
#
# Adding tap-windows driver will break others, so we add all drivers
# Adding tap-windows driver will break others, so we add all drivers
# here. Get re6stnet client count, then remove extra drivers and add
# here. Get re6stnet client count, then remove extra drivers and add
# required drivers.
# required drivers.
...
@@ -517,7 +508,7 @@ echo
...
@@ -517,7 +508,7 @@ echo
echo
echo
cat
$crontab_file
||
show_error_exit
"No crob tab found."
cat
$crontab_file
||
show_error_exit
"No crob tab found."
echo
echo
echo
echo
if
ps
-ef
|
grep
-q
"/usr/sbin/cron"
;
then
if
ps
-ef
|
grep
-q
"/usr/sbin/cron"
;
then
echo
"The cron job is running."
echo
"The cron job is running."
else
else
...
...
windows/scripts/slapos-include.sh
View file @
48aabca1
...
@@ -19,7 +19,6 @@ slapos_ifname=re6stnet-lo
...
@@ -19,7 +19,6 @@ slapos_ifname=re6stnet-lo
ipv4_local_network
=
10.201.67.0/24
ipv4_local_network
=
10.201.67.0/24
re6stnet_configure_file
=
/etc/re6stnet/re6stnet.conf
re6stnet_configure_file
=
/etc/re6stnet/re6stnet.conf
re6stnet_cygwin_script
=
/etc/re6stnet/ovpn-cygwin.bat
re6stnet_service_name
=
slapos-re6stnet
re6stnet_service_name
=
slapos-re6stnet
slaprunner_startup_file
=
/etc/slapos/scripts/slap-runner.html
slaprunner_startup_file
=
/etc/slapos/scripts/slap-runner.html
...
...
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