Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Klaus Wölfel
slapos
Commits
7798dfdf
Commit
7798dfdf
authored
13 years ago
by
Cédric de Saint Martin
Browse files
Options
Download
Email Patches
Plain Diff
KVM frontend : set default port but don't force it to be 4443
parent
2a1a9415
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
software/kvm/instance-frontend.cfg
software/kvm/instance-frontend.cfg
+11
-1
software/kvm/software.cfg
software/kvm/software.cfg
+1
-1
No files found.
software/kvm/instance-frontend.cfg
View file @
7798dfdf
...
...
@@ -12,6 +12,7 @@ parts =
ca-frontend
certificate-authority
frontend-promise
publish-kvm-frontend-connection-information
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
...
@@ -48,7 +49,7 @@ recipe = slapos.cookbook:generic.kvm.frontend
domain = $${ca-frontend:name}
# port = $${slap-parameter:port}
ip = $${slap-network-information:global-ipv6}
port =
4443
port =
$${slap-parameter:port}
# http-port =
# https-port =
ssl-key-path = $${ca-frontend:key-file}
...
...
@@ -130,6 +131,15 @@ logrotate-entries = $${directory:logrotate-entries}
backup = $${directory:logrotate-backup}
state-file = $${rootdirectory:srv}/logrotate.status
[publish-kvm-frontend-connection-information]
recipe = slapos.cookbook:publish
ip = $${frontend-instance:ip}
port = $${frontend-instance:port}
[slap-parameter]
# Default value if no port is specified
port = 4443
# [logrotate-entry-frontend]
# <= logrotate
# recipe = slapos.cookbook:logrotate.d
...
...
This diff is collapsed.
Click to expand it.
software/kvm/software.cfg
View file @
7798dfdf
...
...
@@ -190,7 +190,7 @@ mode = 0644
[template-frontend]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frontend.cfg
md5sum =
16a28991ce59f215f11d7cc61906d64e
md5sum =
f355d5cc6e3d473b9193c2f34e73f312
output = ${buildout:directory}/template-frontend.cfg
mode = 0644
...
...
This diff is collapsed.
Click to expand it.
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