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
13
Merge Requests
13
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
nexedi
slapos.package
Commits
715483ca
Commit
715483ca
authored
Jul 19, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
User declare -r to declare constant;
Fix error client configure file name
parent
bfe0aa67
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
24 deletions
+24
-24
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+24
-24
No files found.
windows/scripts/slapos-include.sh
View file @
715483ca
...
...
@@ -20,33 +20,33 @@ fi
# ======================================================================
# Constants
# ======================================================================
slapos_client_home
=
~/.slapos
client_configure_file
=
$slapos_client_home
/slapos.cfg
client_certificate_file
=
$slapos_client_home
/certificate
client_key_file
=
$slapos_client_home
/key
client_template_file
=
/etc/slapos/slapos-client.cfg.example
node_certificate_file
=
/etc/opt/slapos/ssl/computer.crt
node_key_file
=
/etc/opt/slapos/ssl/computer.key
node_configure_file
=
/etc/opt/slapos/slapos.cfg
node_template_file
=
/etc/slapos/slapos.cfg.example
slapos_ifname
=
re6stnet-lo
declare
-r
slapos_client_home
=
~/.slapos
declare
-r
client_configure_file
=
$slapos_client_home
/slapos.cfg
declare
-r
client_certificate_file
=
$slapos_client_home
/certificate
declare
-r
client_key_file
=
$slapos_client_home
/key
declare
-r
client_template_file
=
/etc/slapos/slapos-client.cfg.example
declare
-r
node_certificate_file
=
/etc/opt/slapos/ssl/computer.crt
declare
-r
node_key_file
=
/etc/opt/slapos/ssl/computer.key
declare
-r
node_configure_file
=
/etc/opt/slapos/slapos.cfg
declare
-r
node_template_file
=
/etc/slapos/slapos.cfg.example
declare
-r
slapos_ifname
=
re6stnet-lo
# Change it if it confilcts with your local network
ipv4_local_network
=
10.201.67.0/24
declare
-r
ipv4_local_network
=
10.201.67.0/24
openvpn_tap_driver_inf
=
/etc/slapos/driver/OemWin2k.inf
openvpn_tap_driver_hwid
=
tap0901
declare
-r
openvpn_tap_driver_inf
=
/etc/slapos/driver/OemWin2k.inf
declare
-r
openvpn_tap_driver_hwid
=
tap0901
re6stnet_configure_file
=
/etc/re6stnet/re6stnet.conf
re6stnet_service_name
=
re6stnet
declare
-r
re6stnet_configure_file
=
/etc/re6stnet/re6stnet.conf
declare
-r
re6stnet_service_name
=
re6stnet
slapos_cron_config
=
/usr/bin/slapos-cron-config
slaprunner_startup_file
=
/etc/slapos/scripts/slap-runner.html
declare
-r
slapos_cron_config
=
/usr/bin/slapos-cron-config
declare
-r
slaprunner_startup_file
=
/etc/slapos/scripts/slap-runner.html
slapos_run_key
=
'\HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
slapos_run_entry
=
slapos-configure
slapos_admin
=
slaproot
declare
-r
slapos_run_key
=
'\HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
declare
-r
slapos_run_entry
=
slapos-configure
declare
-r
slapos_admin
=
slaproot
# ======================================================================
# Routine: check_cygwin_service
...
...
@@ -422,7 +422,7 @@ function create_slapos_webrunner_instance()
if
[[
-n
"
${
_re6stnet_ipv6
}
"
]]
;
then
echo
"Re6stnet address in this computer:
${
_re6stnet_ipv6
}
"
netsh interface ipv6 show addr
$slapos_ifname
level
=
normal |
\
grep
-q
${
_re6stnet_ipv6
}
||
\
grep
-q
"
${
_re6stnet_ipv6
}
$$
"
||
\
netsh interface ipv6 add addr
$slapos_ifname
${
_re6stnet_ipv6
}
fi
fi
...
...
@@ -454,7 +454,7 @@ function create_slapos_webrunner_instance()
# 'password_recovery_code': 'e2d01c14',
# 'ssh_command': 'ssh 2001:67c:1254:45::c5d5 -p 2222',
# 'url': 'http://softinst39090.host.vifib.net/'}
_url
=
$(
/opt/slapos/bin/slapos request
$
client_config_file
\
_url
=
$(
/opt/slapos/bin/slapos request
$
{
client_configure_file
}
\
${
_title
}
slaposwebrunner
--node
computer_guid
=
${
_guid
}
|
\
grep
backend_url |
sed
-e
"s/^.*': '//g"
-e
"s/',.*
$/
/g"
)
[[
-n
"
${
_url
}
"
]]
&&
echo
"SlapOS Web Runner URL:
${
_url
}
"
&&
break
...
...
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