Commit 958c22cd authored by Eric Zheng's avatar Eric Zheng

stack/monitor: merge changes in html5as monitoring

parents fe17a9a9 8ca4ff4b
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
[template-cfg] [template-cfg]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 146b81107081b77ba207102a3237fdef md5sum = 924ea0270c118e3470c04f32da979888
[instance_html5as] [instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in _update_hash_filename_ = instance_html5as.cfg.in
md5sum = 82ce09b079a030bd8f7723f4f89697cb md5sum = 7d438ca356aea0b2ace7378de91e7587
[template_nginx_conf] [template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in _update_hash_filename_ = templates/nginx_conf.in
......
...@@ -35,7 +35,7 @@ default-parameters = ...@@ -35,7 +35,7 @@ default-parameters =
"title": "", "title": "",
"download_url": "", "download_url": "",
"port": 8081, "port": 8081,
"monitor-httpd-port" = 8197 "monitor-httpd-port": 8197
} }
[instance-replicate] [instance-replicate]
......
...@@ -205,7 +205,7 @@ server-cdn-url = ${html5as-frontend-promise:url} ...@@ -205,7 +205,7 @@ server-cdn-url = ${html5as-frontend-promise:url}
<= slap-connection <= slap-connection
# Recipe used to make requests # Recipe used to make requests
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = HTM5AS frontend name = HTML5AS frontend
# Specify the software url of the frontend software release # Specify the software url of the frontend software release
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
# It is not a dedicated instance but an instance allocated on a shared instance # It is not a dedicated instance but an instance allocated on a shared instance
......
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