Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
958c22cd
Commit
958c22cd
authored
Jul 05, 2021
by
Eric Zheng
Browse files
Options
Browse Files
Download
Plain Diff
stack/monitor: merge changes in html5as monitoring
parents
fe17a9a9
8ca4ff4b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
software/html5as/buildout.hash.cfg
software/html5as/buildout.hash.cfg
+2
-2
software/html5as/instance.cfg.in
software/html5as/instance.cfg.in
+1
-1
software/html5as/instance_html5as.cfg.in
software/html5as/instance_html5as.cfg.in
+1
-1
No files found.
software/html5as/buildout.hash.cfg
View file @
958c22cd
...
...
@@ -17,11 +17,11 @@
[template-cfg]
filename = instance.cfg.in
md5sum =
146b81107081b77ba207102a3237fdef
md5sum =
924ea0270c118e3470c04f32da979888
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
md5sum =
82ce09b079a030bd8f7723f4f89697cb
md5sum =
7d438ca356aea0b2ace7378de91e7587
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
...
...
software/html5as/instance.cfg.in
View file @
958c22cd
...
...
@@ -35,7 +35,7 @@ default-parameters =
"title": "",
"download_url": "",
"port": 8081,
"monitor-httpd-port"
=
8197
"monitor-httpd-port"
:
8197
}
[instance-replicate]
...
...
software/html5as/instance_html5as.cfg.in
View file @
958c22cd
...
...
@@ -205,7 +205,7 @@ server-cdn-url = ${html5as-frontend-promise:url}
<= slap-connection
# Recipe used to make requests
recipe = slapos.cookbook:requestoptional
name = HTM5AS frontend
name = HTM
L
5AS frontend
# 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
# It is not a dedicated instance but an instance allocated on a shared instance
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment