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
c241caf1
Commit
c241caf1
authored
May 05, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix suffix of template file name
parent
02439eed
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
windows/scripts/slapos-client-config.sh
windows/scripts/slapos-client-config.sh
+9
-8
windows/scripts/slapos-node-config.sh
windows/scripts/slapos-node-config.sh
+2
-2
No files found.
windows/scripts/slapos-client-config.sh
View file @
c241caf1
...
@@ -11,6 +11,7 @@ slapos_client_home=~/.slapos
...
@@ -11,6 +11,7 @@ slapos_client_home=~/.slapos
client_configure_file
=
$slapos_client_home
/slapos.cfg
client_configure_file
=
$slapos_client_home
/slapos.cfg
client_certificate_file
=
$slapos_client_home
/certificate
client_certificate_file
=
$slapos_client_home
/certificate
client_key_file
=
$slapos_client_home
/key
client_key_file
=
$slapos_client_home
/key
template_configure_file
=
/etc/slapos/slapos-client.cfg.example
mkdir
-p
$slapos_client_home
mkdir
-p
$slapos_client_home
...
@@ -48,10 +49,10 @@ elif [[ ! -f $client_key_file ]] ; then
...
@@ -48,10 +49,10 @@ elif [[ ! -f $client_key_file ]] ; then
fi
fi
if
[[
!
-f
$client_configure_file
]]
;
then
if
[[
!
-f
$client_configure_file
]]
;
then
[[
-f
/etc/slapos/slapos-client.cfg.samp
le
]]
||
\
[[
-f
$template_configure_fi
le
]]
||
\
(
cd
/etc/slapos
;
wget
-O
slapos.cfg http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example
)
||
\
(
cd
/etc/slapos
;
wget
-O
slapos.cfg http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example
)
||
\
(
echo
"Download slapos-client.cfg.example failed."
;
exit
1
)
(
echo
"Download slapos-client.cfg.example failed."
;
exit
1
)
cp
/etc/slapos/slapos.cfg.samp
le
$client_configure_file
cp
$template_configure_fi
le
$client_configure_file
fi
fi
sed
-i
-e
"s/^cert_file.*
$/
cert_file =
$client_certificate_file
/"
\
sed
-i
-e
"s/^cert_file.*
$/
cert_file =
$client_certificate_file
/"
\
...
...
windows/scripts/slapos-node-config.sh
View file @
c241caf1
...
@@ -153,11 +153,11 @@ mkdir -p /etc/opt/slapos/ssl/partition_pki
...
@@ -153,11 +153,11 @@ mkdir -p /etc/opt/slapos/ssl/partition_pki
nodecfgfile
=
/etc/opt/slapos/slapos.cfg
nodecfgfile
=
/etc/opt/slapos/slapos.cfg
if
[[
!
-f
$nodecfgfile
]]
;
then
if
[[
!
-f
$nodecfgfile
]]
;
then
[[
-f
/etc/slapos/slapos.cfg.
s
ample
]]
||
\
[[
-f
/etc/slapos/slapos.cfg.
ex
ample
]]
||
\
(
cd
/etc/slapos
;
wget
-O
slapos.cfg http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos.cfg.example
)
||
\
(
cd
/etc/slapos
;
wget
-O
slapos.cfg http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos.cfg.example
)
||
\
(
echo
"Download slapos.cfg.example failed."
;
exit
1
)
(
echo
"Download slapos.cfg.example failed."
;
exit
1
)
cp
/etc/slapos/slapos.cfg.
s
ample
$nodecfgfile
cp
/etc/slapos/slapos.cfg.
ex
ample
$nodecfgfile
fi
fi
interface_guid
=
$(
connection2guid re6stnet-lo
)
interface_guid
=
$(
connection2guid re6stnet-lo
)
...
...
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