Merge pull request #2547 from wadkar/traefik-fix-www

This commit is contained in:
Bruno Alla 2020-04-24 15:33:49 +01:00 committed by GitHub
commit c30d94cbd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View File

@ -206,6 +206,7 @@ Listed in alphabetical order.
Srinivas Nyayapati `@shireenrao`_ Srinivas Nyayapati `@shireenrao`_
stepmr `@stepmr`_ stepmr `@stepmr`_
Steve Steiner `@ssteinerX`_ Steve Steiner `@ssteinerX`_
Sudarshan Wadkar `@wadkar`_
Sule Marshall `@suledev`_ Sule Marshall `@suledev`_
Tano Abeleyra `@tanoabeleyra`_ Tano Abeleyra `@tanoabeleyra`_
Taylor Baldwin Taylor Baldwin
@ -393,6 +394,7 @@ Listed in alphabetical order.
.. _@umrashrf: https://github.com/umrashrf .. _@umrashrf: https://github.com/umrashrf
.. _@viviangb: https://github.com/viviangb .. _@viviangb: https://github.com/viviangb
.. _@vladdoster: https://github.com/vladdoster .. _@vladdoster: https://github.com/vladdoster
.. _@wadkar: https://github.com/wadkar
.. _@xpostudio4: https://github.com/xpostudio4 .. _@xpostudio4: https://github.com/xpostudio4
.. _@yrchen: https://github.com/yrchen .. _@yrchen: https://github.com/yrchen
.. _@yunti: https://github.com/yunti .. _@yunti: https://github.com/yunti

View File

@ -28,7 +28,11 @@ certificatesResolvers:
http: http:
routers: routers:
web-router: web-router:
{%- if cookiecutter.domain_name.count('.') == 1 %}
rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)" rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
{% else %}
rule: "Host(`{{ cookiecutter.domain_name }}`)"
{%- endif %}
entryPoints: entryPoints:
- web - web
middlewares: middlewares:
@ -37,7 +41,11 @@ http:
service: django service: django
web-secure-router: web-secure-router:
{%- if cookiecutter.domain_name.count('.') == 1 %}
rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)" rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
{% else %}
rule: "Host(`{{ cookiecutter.domain_name }}`)"
{%- endif %}
entryPoints: entryPoints:
- web-secure - web-secure
middlewares: middlewares: