Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
842e044e
Commit
842e044e
authored
Jun 01, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Set consistent username on log access
Do not upper filenames nor users, use them as is.
parent
d995b4c6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+3
-3
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+0
-1
software/caddy-frontend/templates/template-log-access.conf.in
...ware/caddy-frontend/templates/template-log-access.conf.in
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
842e044e
...
...
@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
1867c268830af61bcc245d0c88b634fb
md5sum =
c28797d929eab286cada3a4891ba5de0
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
...
...
@@ -43,7 +43,7 @@ md5sum = edfdd21d712f4ba4c2e1fcb9ea096554
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
1867c268830af61bcc245d0c88b634fb
md5sum =
c28797d929eab286cada3a4891ba5de0
[template-not-found-html]
filename = templates/notfound.html
...
...
@@ -63,7 +63,7 @@ md5sum = be76c0e96df722dee278077988d869a6
[template-log-access]
filename = templates/template-log-access.conf.in
md5sum =
b816d5f5954c0b2bf7945bb0770e7a01
md5sum =
257cf49a61972270d8056c0bb6c3f35f
[template-empty]
filename = templates/empty.in
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
842e044e
...
...
@@ -47,7 +47,6 @@ crl = {{ custom_ssl_directory }}/crl/
{# Loop throught slave list to set up slaves #}
{% for slave_instance in slave_instance_list -%}
{# # Do all set and do upper, so it makes easy to read the file later #}
{% set slave_reference = slave_instance.get('slave_reference') -%}
{% set slave_type = slave_instance.get('type', '') -%}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference -%}
...
...
software/caddy-frontend/templates/template-log-access.conf.in
View file @
842e044e
...
...
@@ -4,7 +4,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4
root {{directory}}/
browse
tls {{ login_certificate }} {{ login_key }}
basicauth "{{ slave
.upper()
}}" {{ slave_password[slave] }} {
basicauth "{{ slave }}" {{ slave_password[slave] }} {
"Log Access {{ slave }}"
/
}
...
...
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