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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos
Commits
cf46001f
Commit
cf46001f
authored
Jun 01, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Implement verbose logging
parent
b067406d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
21 deletions
+8
-21
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+3
-3
software/caddy-frontend/templates/Caddyfile.in
software/caddy-frontend/templates/Caddyfile.in
+2
-6
software/caddy-frontend/templates/default-virtualhost.conf.in
...ware/caddy-frontend/templates/default-virtualhost.conf.in
+2
-9
software/caddy-frontend/templates/template-log-access.conf.in
...ware/caddy-frontend/templates/template-log-access.conf.in
+1
-3
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
cf46001f
...
@@ -38,7 +38,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
...
@@ -38,7 +38,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
[template-caddy-frontend-configuration]
[template-caddy-frontend-configuration]
filename = templates/Caddyfile.in
filename = templates/Caddyfile.in
md5sum =
66975b5c3c3544c365b93e2ae58531f8
md5sum =
5c048a80c2e9374adea0cd647d14b192
[template-custom-slave-list]
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
...
@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
...
@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-slave-virtualhost]
[template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in
filename = templates/default-virtualhost.conf.in
md5sum =
7d066875a9c03036ec3996714980d75a
md5sum =
19322acbbb17eaca36a51ce1aec47230
[template-cached-slave-virtualhost]
[template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in
filename = templates/cached-virtualhost.conf.in
...
@@ -58,7 +58,7 @@ md5sum = 7a1fa1239f29cf1a3f6f578f6ff05ca3
...
@@ -58,7 +58,7 @@ md5sum = 7a1fa1239f29cf1a3f6f578f6ff05ca3
[template-log-access]
[template-log-access]
filename = templates/template-log-access.conf.in
filename = templates/template-log-access.conf.in
md5sum =
0867232c154e427b9e0f1af7fd694ebb
md5sum =
cbf492b2fd8a955b0f92eb512fe9163f
[template-empty]
[template-empty]
filename = templates/empty.in
filename = templates/empty.in
...
...
software/caddy-frontend/templates/Caddyfile.in
View file @
cf46001f
...
@@ -50,9 +50,7 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
...
@@ -50,9 +50,7 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
tls {{ login_certificate }} {{ login_key }}
tls {{ login_certificate }} {{ login_key }}
bind {{ local_ipv4 }}
bind {{ local_ipv4 }}
status 404 /
status 404 /
# TODO-Caddy LogLevel notice
log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
# TODO-Caddy LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
log / {{ access_log }} {combined}
errors {{ error_log }} {
errors {{ error_log }} {
* {{ not_found_file }}
* {{ not_found_file }}
}
}
...
@@ -67,9 +65,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv
...
@@ -67,9 +65,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv
}
}
expvar
expvar
pprof
pprof
# TODO-Caddy LogLevel notice
log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
# TODO-Caddy LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
log / {{ access_log }} {combined}
errors {{ error_log }} {
errors {{ error_log }} {
* {{ not_found_file }}
* {{ not_found_file }}
}
}
...
...
software/caddy-frontend/templates/default-virtualhost.conf.in
View file @
cf46001f
...
@@ -31,10 +31,7 @@
...
@@ -31,10 +31,7 @@
alpn http/1.1
alpn http/1.1
{%- endif %}
{%- endif %}
}
}
# TODO-Caddy # One Slave two logs
log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
# TODO-Caddy LogLevel notice
# TODO-Caddy LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
log / {{ slave_parameter.get('access_log') }} {combined}
errors {{ slave_parameter.get('error_log') }}
errors {{ slave_parameter.get('error_log') }}
# TODO-Caddy SSLProtocol all -SSLv2 -SSLv3
# TODO-Caddy SSLProtocol all -SSLv2 -SSLv3
...
@@ -123,13 +120,9 @@
...
@@ -123,13 +120,9 @@
status 501 /
status 501 /
{%- endif %}
{%- endif %}
log / {{ slave_parameter.get('access_log') }}
{combined}
log / {{ slave_parameter.get('access_log') }}
"{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
errors {{ slave_parameter.get('error_log') }}
errors {{ slave_parameter.get('error_log') }}
# TODO-Caddy # One Slave two logs
# TODO-Caddy LogLevel notice
# TODO-Caddy LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
# TODO-Caddy # Remove "Secure" from cookies, as backend may be https
# TODO-Caddy # Remove "Secure" from cookies, as backend may be https
# TODO-Caddy Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
# TODO-Caddy Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
...
...
software/caddy-frontend/templates/template-log-access.conf.in
View file @
cf46001f
...
@@ -8,9 +8,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4
...
@@ -8,9 +8,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4
"Log Access {{ slave }}"
"Log Access {{ slave }}"
/
/
}
}
# TODO-Caddy LogLevel notice
log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
# TODO-Caddy LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
log / {{ access_log }} {combined}
errors {{ error_log }} {
errors {{ error_log }} {
* {{ not_found_file }}
* {{ not_found_file }}
}
}
...
...
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