Commit 9a5b940f authored by Alain Takoudjou's avatar Alain Takoudjou

kvm: add monitor frontend, increase apache connexion limit

parent 96ff0e45
......@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum = 6e4f3819c4cdaf27896f3762a53a3f18
md5sum = c03816e4ed3657361c95d2047e4c6524
download-only = true
on-update = true
......@@ -184,7 +184,7 @@ recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/apache.conf.in
mode = 644
filename = apache.conf.in
md5sum = e9c9fd88d71e9dc7416149af5bcfb951
md5sum = 355fdabdb86fee8e9714b6d357149958
download-only = true
on-update = true
......
......@@ -334,6 +334,23 @@ source = ${directory:public}
[monitor-parameters]
port = 8026
[request-monitor-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
name = Monitor {{ slapparameter_dict.get('name', '') }} Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config-url = ${monitor-parameters:url}
return = site_url domain
[monitor-frontend-promise]
recipe = slapos.cookbook:check_url_available
path = $${directory:promises}/monitor_frontend
url = ${publish-connection-information:monitor_url}
dash_path = {{ dash_executable_location }}
curl_path = {{ curl_executable_location }}
check-secure = 1
{% endif -%}
[publish-connection-information]
......@@ -371,7 +388,8 @@ tap-ipv4 = ${slap-network-information:tap-ipv4}
{% endif %}
{% endif %}
{% if monitor -%}
monitor_url = ${monitor-parameters:url}
monitor_url = ${request-monitor-frontend:connection-site_url}
monitor_v6_url = ${monitor-parameters:url}
{% endif -%}
{% if use_tap == 'true' and tap_network_dict.has_key('ipv4') -%}
......
ServerLimit 2
ServerLimit 16
StartServers 1
MaxClients 2
MaxClients 7
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
......
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