KVM frontend : set default port but don't force it to be 4443

parent 2a1a9415
...@@ -12,6 +12,7 @@ parts = ...@@ -12,6 +12,7 @@ parts =
ca-frontend ca-frontend
certificate-authority certificate-authority
frontend-promise frontend-promise
publish-kvm-frontend-connection-information
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
...@@ -48,7 +49,7 @@ recipe = slapos.cookbook:generic.kvm.frontend ...@@ -48,7 +49,7 @@ recipe = slapos.cookbook:generic.kvm.frontend
domain = $${ca-frontend:name} domain = $${ca-frontend:name}
# port = $${slap-parameter:port} # port = $${slap-parameter:port}
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 4443 port = $${slap-parameter:port}
# http-port = # http-port =
# https-port = # https-port =
ssl-key-path = $${ca-frontend:key-file} ssl-key-path = $${ca-frontend:key-file}
...@@ -130,6 +131,15 @@ logrotate-entries = $${directory:logrotate-entries} ...@@ -130,6 +131,15 @@ logrotate-entries = $${directory:logrotate-entries}
backup = $${directory:logrotate-backup} backup = $${directory:logrotate-backup}
state-file = $${rootdirectory:srv}/logrotate.status 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-entry-frontend]
# <= logrotate # <= logrotate
# recipe = slapos.cookbook:logrotate.d # recipe = slapos.cookbook:logrotate.d
......
...@@ -190,7 +190,7 @@ mode = 0644 ...@@ -190,7 +190,7 @@ mode = 0644
[template-frontend] [template-frontend]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frontend.cfg url = ${:_profile_base_location_}/instance-frontend.cfg
md5sum = 16a28991ce59f215f11d7cc61906d64e md5sum = f355d5cc6e3d473b9193c2f34e73f312
output = ${buildout:directory}/template-frontend.cfg output = ${buildout:directory}/template-frontend.cfg
mode = 0644 mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment