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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
aeb3ab41
Commit
aeb3ab41
authored
6 years ago
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Honor monitor variables from request
parent
a91330d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-apache-frontend.cfg
software/caddy-frontend/instance-apache-frontend.cfg
+4
-4
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
aeb3ab41
...
...
@@ -18,7 +18,7 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
[template-apache-frontend]
filename = instance-apache-frontend.cfg
md5sum =
2db996d2c48c0fe03c05f051e7a914bc
md5sum =
1f7bd1a8e1fd3d77470bc36dcd68a023
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/instance-apache-frontend.cfg
View file @
aeb3ab41
...
...
@@ -123,6 +123,8 @@ configuration.trafficserver-mgmt-port = 8084
configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
configuration.enable-http2-by-default = true
configuration.mpm-graceful-shutdown-timeout = 5
configuration.monitor-cors-domains =
configuration.monitor-httpd-port = 8072
[frontend-configuration]
template-log-access = ${template-log-access:target}
...
...
@@ -610,8 +612,6 @@ apache-certificate =
open-port = 80 443
extra_slave_instance_list =
frontend-name =
monitor-cors-domains =
monitor-httpd-port = 8072
monitor-username = $${monitor-instance-parameter:username}
monitor-password = $${monitor-htpasswd:passwd}
...
...
@@ -620,8 +620,8 @@ monitor-password = $${monitor-htpasswd:passwd}
#
[monitor-instance-parameter]
monitor-httpd-port = $${
slap-parameter:
monitor-httpd-port}
cors-domains = $${
slap-parameter:
monitor-cors-domains}
monitor-httpd-port = $${
instance-parameter:configuration.
monitor-httpd-port}
cors-domains = $${
instance-parameter:configuration.
monitor-cors-domains}
username = $${slap-parameter:monitor-username}
password = $${slap-parameter:monitor-password}
...
...
This diff is collapsed.
Click to expand it.
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