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
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
Léo-Paul Géneau
slapos
Commits
6f14f492
Commit
6f14f492
authored
Feb 04, 2021
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Respect globality of haproxy acls
parent
cc023eac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
software/caddy-frontend/CHANGES.caddy_frontend.rst
software/caddy-frontend/CHANGES.caddy_frontend.rst
+1
-0
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/backend-haproxy.cfg.in
software/caddy-frontend/templates/backend-haproxy.cfg.in
+3
-3
No files found.
software/caddy-frontend/CHANGES.caddy_frontend.rst
View file @
6f14f492
...
@@ -20,6 +20,7 @@ Here are listed the most important changes, which might affect upgrades.
...
@@ -20,6 +20,7 @@ Here are listed the most important changes, which might affect upgrades.
* feature: Strict-Transport-Security aka HSTS
* feature: Strict-Transport-Security aka HSTS
* fix: use kedifa with with for file with multiple CAs
* fix: use kedifa with with for file with multiple CAs
* feature: support query string (the characters after ? in the url) in url and https-url
* feature: support query string (the characters after ? in the url) in url and https-url
* fix: by having unique acl names fix rare bug of directing traffic to https-url instead of url or otherwise
1.0.164 (2020-09-24)
1.0.164 (2020-09-24)
--------------------
--------------------
...
...
software/caddy-frontend/buildout.hash.cfg
View file @
6f14f492
...
@@ -50,7 +50,7 @@ md5sum = a0ae858a3db8825c22d33d323392f588
...
@@ -50,7 +50,7 @@ md5sum = a0ae858a3db8825c22d33d323392f588
[template-backend-haproxy-configuration]
[template-backend-haproxy-configuration]
_update_hash_filename_ = templates/backend-haproxy.cfg.in
_update_hash_filename_ = templates/backend-haproxy.cfg.in
md5sum =
b9b56e0018bfbfa5b6c2640f95e6f750
md5sum =
8c4e2548a12c8fd7dba74f940201745a
[template-empty]
[template-empty]
_update_hash_filename_ = templates/empty.in
_update_hash_filename_ = templates/empty.in
...
...
software/caddy-frontend/templates/backend-haproxy.cfg.in
View file @
6f14f492
...
@@ -25,14 +25,14 @@ defaults
...
@@ -25,14 +25,14 @@ defaults
{%- if wildcard and host.startswith('*.') %}
{%- if wildcard and host.startswith('*.') %}
{%- do matched.__setitem__('count', matched['count'] + 1) %}
{%- do matched.__setitem__('count', matched['count'] + 1) %}
# match wildcard {{ host }}
# match wildcard {{ host }}
acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i {{ host[2:] }}($|:.*)
acl is_{{ slave_instance['slave_reference'] }}
_{{ scheme }}
hdr_reg(host) -i {{ host[2:] }}($|:.*)
{%- elif not wildcard and not host.startswith('*.') %}
{%- elif not wildcard and not host.startswith('*.') %}
{%- do matched.__setitem__('count', matched['count'] + 1) %}
{%- do matched.__setitem__('count', matched['count'] + 1) %}
acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i ^{{ host }}($|:.*)
acl is_{{ slave_instance['slave_reference'] }}
_{{ scheme }}
hdr_reg(host) -i ^{{ host }}($|:.*)
{%- endif %}
{%- endif %}
{%- endfor %}
{%- endfor %}
{%- if matched['count'] > 0 %}
{%- if matched['count'] > 0 %}
use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}
use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}
_{{ scheme }}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endmacro %}
{%- endmacro %}
...
...
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