Update configuration

City-of-Helsinki · Jun 19, 2024 · 0e09fe5 · 0e09fe5
1 parent 98dc551
commit 0e09fe5
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 101 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-6
+7
diff --git a/compose.yaml b/compose.yaml
@@ -100,17 +100,17 @@ services:
       - internal
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.nginx.entrypoints=https"
-      - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
-      - "traefik.http.services.nginx.loadbalancer.server.port=8080"
-      - "traefik.http.routers.nginx.tls=true"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.entrypoints=https"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.tls=true"
+      - "traefik.http.services.${COMPOSE_PROJECT_NAME}-elastic-proxy.loadbalancer.server.port=8080"
       - "traefik.docker.network=stonehenge-network"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowmethods=GET,OPTIONS,POST"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowheaders=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolalloworiginlist=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolmaxage=100"
       - "traefik.http.middlewares.cors-header.headers.addvaryheader=true"
-      - "traefik.http.routers.nginx.middlewares=cors-header"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.middlewares=cors-header"
     depends_on:
       - elastic
     profiles:

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/language/de/filter.format.plain_text.yml b/conf/cmi/language/de/filter.format.plain_text.yml
@@ -1 +1 @@
-name: 'Unformatierter Text'
+name: Klartext
diff --git a/conf/cmi/language/de/views.view.archive.yml b/conf/cmi/language/de/views.view.archive.yml
@@ -18,7 +18,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       arguments:

diff --git a/conf/cmi/language/de/views.view.content.yml b/conf/cmi/language/de/views.view.content.yml
@@ -25,15 +25,15 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
             first: '« Anfang'
             last: 'Ende »'
       exposed_form:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:

diff --git a/conf/cmi/language/de/views.view.content_recent.yml b/conf/cmi/language/de/views.view.content_recent.yml
@@ -12,7 +12,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty: