Commit b635249d authored by Jérome Perrin's avatar Jérome Perrin

monitor local hack

parent d54a16ab
...@@ -117,3 +117,10 @@ notebook_dir = $${:var}/notebooks ...@@ -117,3 +117,10 @@ notebook_dir = $${:var}/notebooks
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = https://$${instance-parameter:host}:$${instance-parameter:port} url = https://$${instance-parameter:host}:$${instance-parameter:port}
# Monitoring hack for ipv4
# XXX this software is still ipv4
[monitor-httpd-configuration]
listening-ip = $${slap-parameters:ipv4-random}
[monitor-parameters]
url = https://$${monitor-httpd-configuration:listening-ip}:$${:port}
...@@ -57,7 +57,7 @@ mode = 0644 ...@@ -57,7 +57,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
download-only = true download-only = true
md5sum = 2d48f8b8e01fa0fdde964ed1c1547f05 #md5sum = 2d48f8b8e01fa0fdde964ed1c1547f05
filename = cgi-httpd.conf.in filename = cgi-httpd.conf.in
mode = 0644 mode = 0644
......
...@@ -2,7 +2,8 @@ PidFile "{{ httpd_configuration.get('pid-file') }}" ...@@ -2,7 +2,8 @@ PidFile "{{ httpd_configuration.get('pid-file') }}"
ServerName example.com ServerName example.com
ServerAdmin someone@email ServerAdmin someone@email
<IfDefine !MonitorPort> <IfDefine !MonitorPort>
Listen [{{ httpd_configuration.get('listening-ip') }}]:{{ monitor_parameters.get('port') }} #Listen [{{ httpd_configuration.get('listening-ip') }}]:{{ monitor_parameters.get('port') }}
Listen {{ httpd_configuration.get('listening-ip') }}:{{ monitor_parameters.get('port') }}
Define MonitorPort Define MonitorPort
</IfDefine> </IfDefine>
DocumentRoot "{{ directory.get('www') }}" DocumentRoot "{{ directory.get('www') }}"
......
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