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
Labels
Merge Requests
91
Merge Requests
91
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
e6e6d411
Commit
e6e6d411
authored
Feb 28, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Set same monitor password on all instances
This allows to use monitor-setup-url correctly.
parent
6e985ada
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+3
-3
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+1
-0
software/caddy-frontend/instance-apache-replicate.cfg.in
software/caddy-frontend/instance-apache-replicate.cfg.in
+9
-2
software/caddy-frontend/instance-kedifa.cfg.in
software/caddy-frontend/instance-kedifa.cfg.in
+1
-0
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
e6e6d411
...
...
@@ -22,11 +22,11 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
md5sum =
7dbceb62d845b7951c3c9efa8c3d5bf6
md5sum =
48fb25df53d1465f4c95d1d9c39c40d2
[template-caddy-replicate]
filename = instance-apache-replicate.cfg.in
md5sum =
3ada9a41527c6d457798890422b67176
md5sum =
6e2d9a5c6ebe6e9afafaff3441ada225
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
...
...
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
[template-kedifa]
filename = instance-kedifa.cfg.in
md5sum =
e8d3d7dfe78682f8bcf4b308165d2971
md5sum =
7814a48cc05d25c8f2d7b527ef2485b5
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
e6e6d411
...
...
@@ -683,6 +683,7 @@ config-port = ${caddy-configuration:ssl-cache-through-port}
# directly, and in our case it can come from the network, thus resulting
# with need to strip !py!'u'
monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
password = {{ instance_parameter['configuration.monitor-password'] | string }}
[monitor-conf-parameters]
private-path-list +=
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
e6e6d411
...
...
@@ -209,13 +209,19 @@ context =
[monitor-instance-parameter]
monitor-httpd-port = {{ master_partition_monitor_monitor_httpd_port }}
password = ${publish-early:monitor-password}
[publish-early]
recipe = slapos.cookbook:publish-early
-init =
monitor-password monitor-htpasswd:passwd
[replicate]
<= slap-connection
recipe = slapos.cookbook:requestoptional.serialised
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${
monitor-htpasswd:passw
d}
config-monitor-password = ${
publish-early:monitor-passwor
d}
{% set frontend_software_url_key = "-frontend-software-release-url" %}
{% if slapparameter_dict.has_key(frontend_software_url_key) %}
...
...
@@ -310,7 +316,7 @@ custom-group = ${dynamic-publish-slave-information:rendered}
recipe = slapos.cookbook:requestoptional.serialised
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${
monitor-htpasswd:passw
d}
config-monitor-password = ${
publish-early:monitor-passwor
d}
config-monitor-httpd-port = {{ kedifa_partition_monitor_httpd_port }}
{% for key in ['kedifa_port', 'caucase_port'] -%}
{%- if key in slapparameter_dict %}
...
...
@@ -615,6 +621,7 @@ extends =
{{ template_monitor }}
parts =
monitor-base
publish-early
publish-slave-information
publish-information
request-kedifa
...
...
software/caddy-frontend/instance-kedifa.cfg.in
View file @
e6e6d411
...
...
@@ -25,6 +25,7 @@ parts =
# directly, and in our case it can come from the network, thus resulting
# with need to strip !py!'u'
monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
password = {{ instance_parameter['configuration.monitor-password'] | string }}
[caucased]
hash-existing-files = ${buildout:directory}/software_release/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