Merge pull request #561 from WebarchivCZ/master

Hotfix routing to static and media

Author: westfood

ci/prod

@@ -15,4 +15,5 @@ prod:
     seeder_django_email_backend: 'django.core.mail.backends.smtp.EmailBackend'
     seeder_django_email_host: 10.1.2.183
     treafik_seeder_rule: "Host(`webarchiv.cz`) || Host(`www.webarchiv.cz`) || Host(`seeder.webarchiv.cz`)"
+    treafik_seeder_static_rule: "Host(`webarchiv.cz`) && (PathPrefix(`/static`) || PathPrefix(`/media`)) || Host(`www.webarchiv.cz`) && (PathPrefix(`/static`) || PathPrefix(`/media`)) || Host(`seeder.webarchiv.cz`) && (PathPrefix(`/static`) || PathPrefix(`/media`))"
     treafik_api_rule: "Host(`wa-docker00`) || Host(`10.3.0.50`)"

ci/templates/docker-compose.yaml

@@ -64,7 +64,7 @@ services:
       - media:/seeder/media
       - ./nginx.conf:/etc/nginx/conf.d/default.conf
     labels:
-      traefik.http.routers.static.rule: "{{ treafik_seeder_rule }} && PathPrefix(`/static`) || PathPrefix(`/media`)"
+      traefik.http.routers.static.rule: "{{ treafik_seeder_static_rule }}"
     depends_on:
       - web
 

ci/test

@@ -13,4 +13,5 @@ test:
     seeder_django_allowed_hosts: app.webarchiv.cz
     seeder_django_debug: 'False'
     treafik_seeder_rule: "Host(`app.webarchiv.cz`)"
+    treafik_seeder_static_rule: "Host(`app.webarchiv.cz`) && (PathPrefix(`/static`) || PathPrefix(`/media`))"
     treafik_api_rule: "Host(`wa-dev-docker00`) || Host(`10.3.0.110`)"