Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Léo-Paul Géneau
slapos
Commits
d3ed68a6
Commit
d3ed68a6
authored
Aug 01, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-windows-installer: add ipv4-local-network paramter
parent
f317e69b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
software/slapos-windows-installer/instance.cfg.in
software/slapos-windows-installer/instance.cfg.in
+7
-3
software/slapos-windows-installer/software.cfg
software/slapos-windows-installer/software.cfg
+4
-4
No files found.
software/slapos-windows-installer/instance.cfg.in
View file @
d3ed68a6
...
...
@@ -26,7 +26,11 @@ pre-install =
cp $cyghome/test-computer.key $${buildout:directory}/cygwin/computer.key
cp ${installer:cygroot}/slapos-windows-wrapper.bat $${buildout:directory}/slapos-windows-wrapper.bat
make-binary = true
# The parameter "slaptester" is the password of slapos administrator
# passed to configure script
post-install =
$${buildout:directory}/slapos-windows-wrapper.bat slapos-configure slaptester
$${buildout:directory}/slapos-windows-wrapper.bat /etc/slapos/scripts/slapos-configure.sh \
--password=slaptester \
--ipv4-local-network=10.89.208.0/24 \
--client-certificate=/certificate \
--client-key=/key \
--computer-certificate=/computer.crt \
--computer-key=/computer.key
software/slapos-windows-installer/software.cfg
View file @
d3ed68a6
...
...
@@ -16,13 +16,13 @@ download-only = true
[slapos-build-installer]
recipe = hexagonit.recipe.download
url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-build-installer
md5sum =
4483d6df926c324d5905fef8f1175e43
md5sum =
7aafc3fcf21596c61a8e532bea3275ed
download-only = true
[slapos-windows-wrapper]
recipe = hexagonit.recipe.download
url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-windows-wrapper.bat
md5sum =
5ab0a8f6a1de35d8de5ad616aeca9fcd
md5sum =
e7f1443dab3c0180a906534a1fe95ceb
download-only = true
[setup-cygwin]
...
...
@@ -52,7 +52,7 @@ pre-configure=
chmod +x ${:cygroot}/*.bat
configure-command = ${:cygroot}/setup-cygwin.bat
make-binary = true
post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
post-install= ${:cygroot}/slapos-windows-wrapper.bat
/
slapos-build-installer
#----------------
#-- Instance-level buildout profiles.
...
...
@@ -60,7 +60,7 @@ post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
[instance-template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
md5sum =
cc55040889f472f751f1aaa85e04e88f
md5sum =
8af79052227761407fae5c5a6cb5ec02
output = ${buildout:directory}/instance.cfg
mode = 0644
...
...
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