Merge pull request #2524 from sorasful/master

cookiecutter · Apr 17, 2020 · ca27ddd · ca27ddd
2 parents 4f64278 + 0df3087
commit ca27ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -202,6 +202,7 @@ Listed in alphabetical order.
   Sascha                   `@saschalalala`_             @saschalalala
   Shupeyko Nikita          `@webyneter`_
   Sławek Ehlert            `@slafs`_
+  Sorasful                 `@sorasful`_
   Srinivas Nyayapati       `@shireenrao`_
   stepmr                   `@stepmr`_
   Steve Steiner            `@ssteinerX`_
@@ -376,6 +377,7 @@ Listed in alphabetical order.
 .. _@siauPatrick: https://github.com/siauPatrick
 .. _@sladinji: https://github.com/sladinji
 .. _@slafs: https://github.com/slafs
+.. _@sorasful:: https://github.com/sorasful
 .. _@ssteinerX: https://github.com/ssteinerx
 .. _@step21: https://github.com/step21
 .. _@stepmr: https://github.com/stepmr

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -28,7 +28,7 @@ certificatesResolvers:
 http:
   routers:
     web-router:
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       entryPoints:
         - web
       middlewares:
@@ -37,7 +37,7 @@ http:
       service: django
 
     web-secure-router:
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       entryPoints:
         - web-secure
       middlewares: