Dashboard: Apache takes the ServerName from an environment var now. N…

…eeded for routing authentication to shib
OpenConext · Jan 29, 2024 · 0bd41b6 · 0bd41b6
1 parent 2506f1b
commit 0bd41b6
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/roles/dashboard/tasks/main.yml b/roles/dashboard/tasks/main.yml
@@ -36,11 +36,19 @@
       - source: /opt/openconext/dashboard/logback.xml
         target: /logback.xml
         type: bind
-    command: '--spring.config.location=./'
+    command: "--spring.config.location=./"
     etc_hosts:
       host.docker.internal: host-gateway
     healthcheck:
-      test: ["CMD", "wget", "-no-verbose",  "--tries=1",  "--spider", "http://localhost:8080/internal/health" ]
+      test:
+        [
+          "CMD",
+          "wget",
+          "-no-verbose",
+          "--tries=1",
+          "--spider",
+          "http://localhost:8080/internal/health",
+        ]
       interval: 10s
       timeout: 10s
       retries: 3
@@ -56,28 +64,23 @@
     state: started
     networks:
       - name: "loadbalancer"
-    mounts:
-      - source: /opt/openconext/dashboard/dashboard.conf
-        target: /etc/apache2/sites-enabled/000-default.conf
-        type: bind
-      - source: /opt/openconext/dashboard/shibboleth2.xml
-        target: /etc/shibboleth/shibboleth2.xml
-        type: bind
     labels:
       traefik.http.routers.dashboardgui.rule: "Host(`dashboard.{{ base_domain }}`)"
       traefik.http.routers.dashboardgui.tls: "true"
       traefik.enable: "true"
     healthcheck:
-      test: ["CMD", "curl", "--fail" , "http://localhost/internal/health"  ]
+      test: ["CMD", "curl", "--fail", "http://localhost/internal/health"]
       interval: 10s
       timeout: 10s
       retries: 3
       start_period: 10s
+    hostname: dashboard.test2.surfconext.nl
     env:
       HTTPD_CSP: "{{ httpd_csp.lenient_with_static_img }}"
+      HTTPD_SERVERNAME: "dashboard.{{ base_domain }}"
       OPENCONEXT_INSTANCENAME: "{{ instance_name }}"
       OPENCONEXT_ENGINE_LOGOUT_URL: "https://engine.{{ base_domain }}/logout"
       OPENCONEXT_HELP_EMAIL: "{{ support_email }}"
       SHIB_ENTITYID: "https://dashboard.{{ base_domain }}/shibboleth"
-      SHIB_REMOTE_ENTITYID: "https://engine.{{ base_domain}}/authentication/idp/metadata"
+      SHIB_REMOTE_ENTITYID: "https://engine.{{ base_domain }}/authentication/idp/metadata"
       SHIB_REMOTE_METADATA: "{{ shibboleth_metadata_sources.engine }}"