Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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 Develop
Commits
05d64a87
Commit
05d64a87
authored
Jun 30, 2021
by
Eric Zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
assign each replicate monitor to a different port in html5as tutorial
parent
774293a4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
software/html5as-base/buildout.hash.cfg
software/html5as-base/buildout.hash.cfg
+3
-3
software/html5as-base/instance.cfg.in
software/html5as-base/instance.cfg.in
+1
-1
software/html5as-base/instance_html5as.cfg.in
software/html5as-base/instance_html5as.cfg.in
+3
-2
software/html5as-base/instance_replicate.cfg.in
software/html5as-base/instance_replicate.cfg.in
+2
-0
software/html5as-base/software.cfg
software/html5as-base/software.cfg
+2
-1
No files found.
software/html5as-base/buildout.hash.cfg
View file @
05d64a87
...
...
@@ -17,11 +17,11 @@
[template-cfg]
filename = instance.cfg.in
md5sum =
a954a0a398d6d9b2661439727f37542c
md5sum =
8b82a333993bc2df2ff137de8c993292
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
md5sum =
5e2114488b7170c7a68b406ae83d23fe
md5sum =
7d24357c13d17b630102576c0e33f45c
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
...
...
@@ -45,4 +45,4 @@ md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
[template_instance_replicate]
_update_hash_filename_ = instance_replicate.cfg.in
md5sum =
6a898517af7019afb299b46b9c961777
md5sum =
d1350a2410e684eb2f6682a0cce19a04
software/html5as-base/instance.cfg.in
View file @
05d64a87
...
...
@@ -44,7 +44,7 @@ recipe = slapos.cookbook:softwaretype
default = ${instance-html5as:rendered}
replicate = ${instance-replicate:rendered}
# Section
needed to be added manually here to retrieve parameters
# Section needed to be added manually here to retrieve parameters
[slap-parameters]
recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id}
...
...
software/html5as-base/instance_html5as.cfg.in
View file @
05d64a87
...
...
@@ -165,7 +165,7 @@ config-hostname = ${html5as:ip}
config-port = ${html5as:port}
[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
[logrotate-entry-nginx]
...
...
@@ -179,7 +179,7 @@ post = kill -USR1 $(cat ${html5as:path_pid})
recipe = slapos.cookbook:publish
<= monitor-publish
server_url = ${html5as:access_url}
title =
Title
${slap-parameter:title}
title = ${slap-parameter:title}
server-cdn-url = ${html5as-frontend-promise:url}
[html5as-frontend]
...
...
@@ -204,3 +204,4 @@ config-check-secure = 1
title = foobar
download_url =
port = 8081
monitor-httpd-port = 8197
software/html5as-base/instance_replicate.cfg.in
View file @
05d64a87
...
...
@@ -34,6 +34,7 @@ config-download_url = ${slap-parameter:download_url}
name = instance-html5as-{{ i }}
config-port = ${slap-parameter:port-{{ 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 -%}
sla-computer_guid = {{ slapparameter_dict["sla-%s-computer-guid" % i] }}
{% endif -%}
...
...
@@ -44,6 +45,7 @@ download_url =
{% for i in range(1, replicate_quantity + 1) %}
title-{{ i }} =
port-{{ i }} = 808{{ i }}
monitor-httpd-port-{{ i }} = 819{{ i }}
{% endfor %}
[publish-connection-information]
...
...
software/html5as-base/software.cfg
View file @
05d64a87
...
...
@@ -3,7 +3,8 @@ extends =
# Use buildout.hash.cfg for automaton hash calculation, by calling update-hash.
buildout.hash.cfg
# "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
# Extend monitor stack
../../stack/monitor/buildout.cfg
...
...
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