Commit 05d64a87 authored by Eric Zheng's avatar Eric Zheng

assign each replicate monitor to a different port in html5as tutorial

parent 774293a4
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
[template-cfg] [template-cfg]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = a954a0a398d6d9b2661439727f37542c md5sum = 8b82a333993bc2df2ff137de8c993292
[instance_html5as] [instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in _update_hash_filename_ = instance_html5as.cfg.in
md5sum = 5e2114488b7170c7a68b406ae83d23fe md5sum = 7d24357c13d17b630102576c0e33f45c
[template_nginx_conf] [template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in _update_hash_filename_ = templates/nginx_conf.in
...@@ -45,4 +45,4 @@ md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2 ...@@ -45,4 +45,4 @@ md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
[template_instance_replicate] [template_instance_replicate]
_update_hash_filename_ = instance_replicate.cfg.in _update_hash_filename_ = instance_replicate.cfg.in
md5sum = 6a898517af7019afb299b46b9c961777 md5sum = d1350a2410e684eb2f6682a0cce19a04
...@@ -165,7 +165,7 @@ config-hostname = ${html5as:ip} ...@@ -165,7 +165,7 @@ config-hostname = ${html5as:ip}
config-port = ${html5as:port} config-port = ${html5as:port}
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-port = 8197 monitor-httpd-port = ${slap-parameter:monitor-httpd-port}
# Note that the screenshot on the logrotate page is wrong here, I think # Note that the screenshot on the logrotate page is wrong here, I think
[logrotate-entry-nginx] [logrotate-entry-nginx]
...@@ -179,7 +179,7 @@ post = kill -USR1 $(cat ${html5as:path_pid}) ...@@ -179,7 +179,7 @@ post = kill -USR1 $(cat ${html5as:path_pid})
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
<= monitor-publish <= monitor-publish
server_url = ${html5as:access_url} server_url = ${html5as:access_url}
title = Title ${slap-parameter:title} title = ${slap-parameter:title}
server-cdn-url = ${html5as-frontend-promise:url} server-cdn-url = ${html5as-frontend-promise:url}
[html5as-frontend] [html5as-frontend]
...@@ -204,3 +204,4 @@ config-check-secure = 1 ...@@ -204,3 +204,4 @@ config-check-secure = 1
title = foobar title = foobar
download_url = download_url =
port = 8081 port = 8081
monitor-httpd-port = 8197
...@@ -34,6 +34,7 @@ config-download_url = ${slap-parameter:download_url} ...@@ -34,6 +34,7 @@ config-download_url = ${slap-parameter:download_url}
name = instance-html5as-{{ i }} name = instance-html5as-{{ i }}
config-port = ${slap-parameter:port-{{ i }}} config-port = ${slap-parameter:port-{{ i }}}
config-title = ${slap-parameter:title-{{ i }}} config-title = ${slap-parameter:title-{{ i }}}
config-monitor-httpd-port = ${slap-parameter:monitor-httpd-port-{{ i }}}
{% if "sla-%s-computer-guid" % i in slapparameter_dict -%} {% if "sla-%s-computer-guid" % i in slapparameter_dict -%}
sla-computer_guid = {{ slapparameter_dict["sla-%s-computer-guid" % i] }} sla-computer_guid = {{ slapparameter_dict["sla-%s-computer-guid" % i] }}
{% endif -%} {% endif -%}
...@@ -44,6 +45,7 @@ download_url = ...@@ -44,6 +45,7 @@ download_url =
{% for i in range(1, replicate_quantity + 1) %} {% for i in range(1, replicate_quantity + 1) %}
title-{{ i }} = title-{{ i }} =
port-{{ i }} = 808{{ i }} port-{{ i }} = 808{{ i }}
monitor-httpd-port-{{ i }} = 819{{ i }}
{% endfor %} {% endfor %}
[publish-connection-information] [publish-connection-information]
......
...@@ -3,7 +3,8 @@ extends = ...@@ -3,7 +3,8 @@ extends =
# Use buildout.hash.cfg for automaton hash calculation, by calling update-hash. # Use buildout.hash.cfg for automaton hash calculation, by calling update-hash.
buildout.hash.cfg buildout.hash.cfg
# "slapos" stack describes basic things needed for 99.9% of SlapOS Software # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
# Releases # Releases---switch to "slapos-dev" to use development configurations
# (e.g. custom slapos.toolbox)
../../stack/slapos.cfg ../../stack/slapos.cfg
# Extend monitor stack # Extend monitor stack
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
......
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