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
Ophélie Gagnard
slapos.package
Commits
60363277
Commit
60363277
authored
Jun 27, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix problem that slapos-configure couldn't run
parent
8fb14cc1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
19 deletions
+2
-19
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+2
-19
No files found.
windows/scripts/slapos-configure.sh
View file @
60363277
...
@@ -105,7 +105,7 @@ function query_parameter()
...
@@ -105,7 +105,7 @@ function query_parameter()
if
[[
X
$1
==
X
||
$1
==
"*"
||
$1
==
"all"
]]
;
then
if
[[
X
$1
==
X
||
$1
==
"*"
||
$1
==
"all"
]]
;
then
return
1
return
1
fi
fi
if
[[
$1
==
"?"
||
$1
==
"query"
]]
;
then
if
[[
$1
==
"?"
||
$1
==
"query"
]]
;
then
read
-n
1
-p
$3
user_ack
read
-n
1
-p
$3
user_ack
if
[[
X
$user_ack
==
X[Yy]
]]
;
then
if
[[
X
$user_ack
==
X[Yy]
]]
;
then
return
1
return
1
...
@@ -181,14 +181,7 @@ if [[ ! -f $node_key_file ]] ; then
...
@@ -181,14 +181,7 @@ if [[ ! -f $node_key_file ]] ; then
cp
$key_file
$node_key_file
cp
$key_file
$node_key_file
fi
fi
if
[[
"
$1
"
==
COMP-+
([
0-9]
)
]]
;
then
computer_id
=
$(
grep
CN
=
COMP
$node_certificate_file
|
sed
-e
"s/^.*, CN=//g"
|
sed
-e
"s%/emailAddress.*
\$
%%g"
)
computer_id
=
$1
else
[[
"X
$1
"
==
"X"
]]
||
echo
"Invalid computer id:
$1
"
echo
echo
Please input computer
id
you have registered, it looks like COMP-XXXX
read
-p
"computer id: "
computer_id
fi
[[
"
$computer_id
"
==
COMP-+
([
0-9]
)
]]
||
\
[[
"
$computer_id
"
==
COMP-+
([
0-9]
)
]]
||
\
show_error_exit
"Invalid computer id specified."
show_error_exit
"Invalid computer id specified."
...
@@ -247,16 +240,6 @@ sed -i -e "s%^cert_file.*$%cert_file = $client_certificate_file%" \
...
@@ -247,16 +240,6 @@ sed -i -e "s%^cert_file.*$%cert_file = $client_certificate_file%" \
-e
"s%^key_file.*
$%
key_file =
$client_key_file
%"
\
-e
"s%^key_file.*
$%
key_file =
$client_key_file
%"
\
$client_configure_file
$client_configure_file
# Config slapproxy
if
!
$(
grep
-q
"^
\[
slapproxy
\]
"
$node_config_file
)
;
then
echo
"
[slapproxy]
host = 127.0.0.1
port = 28080
database_uri = /var/lib/slapproxy.db
"
>>
$node_config_file
fi
#
#
# Re6stnet
# Re6stnet
#
#
...
...
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