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
Xiaowu Zhang
slapos.package
Commits
0c067182
Commit
0c067182
authored
Jun 27, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix no slapos client directory create when configure slapos node
parent
60363277
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+12
-12
No files found.
windows/scripts/slapos-configure.sh
View file @
0c067182
...
...
@@ -133,6 +133,9 @@ run_key='\HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
slapos_run_entry
=
SlapOS-Node
slapos_ifname
=
re6stnet-lo
mkdir
-p
/etc/opt/slapos/ssl/partition_pki
mkdir
-p
$slapos_client_home
#
# Add msloop network adapter, ane name it as "re6stnet-lo"
#
...
...
@@ -161,10 +164,8 @@ echo
echo
Refer to http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Installing.SlapOS.Slave.Node.Source
echo
mkdir
-p
/etc/opt/slapos/ssl/partition_pki
if
[[
!
-f
$node_certificate_file
]]
;
then
read
-p
"Where is certificate file: "
certificate_file
read
-p
"Where is c
omputer c
ertificate file: "
certificate_file
[[
!
-f
"
$certificate_file
"
]]
&&
\
show_error_exit
"Certificate file
$certificate_file
doesn't exists."
echo
"Copy certificate from
$certificate_file
to
$node_certificate_file
"
...
...
@@ -172,8 +173,13 @@ if [[ ! -f $node_certificate_file ]] ; then
cp
$certificate_file
$node_certificate_file
fi
computer_id
=
$(
grep
CN
=
COMP
$node_certificate_file
|
sed
-e
"s/^.*, CN=//g"
|
sed
-e
"s%/emailAddress.*
\$
%%g"
)
[[
"
$computer_id
"
==
COMP-+
([
0-9]
)
]]
||
\
show_error_exit
"Invalid computer id specified."
echo
Computer GUID is:
$computer_id
if
[[
!
-f
$node_key_file
]]
;
then
read
-p
"Where is key file: "
key_file
read
-p
"Where is
computer
key file: "
key_file
[[
!
-f
"
$key_file
"
]]
&&
\
show_error_exit
"Key file
$key_file
doesn't exists."
echo
"Copy key from
$key_file
to
$node_key_file
"
...
...
@@ -181,11 +187,6 @@ if [[ ! -f $node_key_file ]] ; then
cp
$key_file
$node_key_file
fi
computer_id
=
$(
grep
CN
=
COMP
$node_certificate_file
|
sed
-e
"s/^.*, CN=//g"
|
sed
-e
"s%/emailAddress.*
\$
%%g"
)
[[
"
$computer_id
"
==
COMP-+
([
0-9]
)
]]
||
\
show_error_exit
"Invalid computer id specified."
# Hope it will not confilct with original network in the local machine
ipv4_local_network
=
10.201.67.0/24
...
...
@@ -210,9 +211,8 @@ sed -i -e "s%^\\s*interface_name.*$%interface_name = $interface_guid%" \
-e
"s%^computer_id.*
$%
computer_id =
$computer_id
%"
\
$node_config_file
if
[[
!
-f
$client_certificate_file
]]
;
then
read
-p
"Where is certificate file: "
certificate_file
read
-p
"Where is
user
certificate file: "
certificate_file
[[
!
-f
"
$certificate_file
"
]]
&&
\
show_error_exit
"Certificate file
$certificate_file
doesn't exists."
echo
"Copy certificate from
$certificate_file
to
$client_certificate_file
"
...
...
@@ -221,7 +221,7 @@ if [[ ! -f $client_certificate_file ]] ; then
fi
if
[[
!
-f
$client_key_file
]]
;
then
read
-p
"Where is key file: "
key_file
read
-p
"Where is
user
key file: "
key_file
[[
!
-f
"
$key_file
"
]]
&&
\
show_error_exit
"Key file
$key_file
doesn't exists."
echo
"Copy key from
$key_file
to
$client_key_file
"
...
...
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