feat(#3): support disabling frontend

eurofurence · Dec 23, 2023 · 5c6623b · 5c6623b
1 parent c5edda0
commit 5c6623b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/charts/eurofurence-registration-system/Chart.yaml b/charts/eurofurence-registration-system/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: eurofurence-registration-system
-version: 0.0.14
+version: 0.0.15
 description: A helm chart that can deploy the Eurofurence Registration System.
 type: application
 home: https://github.com/eurofurence/reg-helm-chart
diff --git a/charts/eurofurence-registration-system/templates/configmap.yaml b/charts/eurofurence-registration-system/templates/configmap.yaml
@@ -412,3 +412,9 @@ data:
       style: {{ .Values.system.logging.style }}
 
   HTTPD_CONF_PATH_PREFIX_NO_SLASHES: '{{ .Values.system.public_base_context }}'
+  HTTPD_CONF_SERVER_NAME: '{{ .Values.ingress.host }}'
+{{- if .Values.system.components.frontend.enable }}
+  HTTPD_CONF_STATIC_DIR: 'reg-frontend'
+{{- else }}
+  HTTPD_CONF_STATIC_DIR: 'reg-frontend-disabled'
+{{- end }}
diff --git a/charts/eurofurence-registration-system/templates/deployments.yaml b/charts/eurofurence-registration-system/templates/deployments.yaml
@@ -62,7 +62,7 @@
 {{ $frontendInput := dict "name" "frontend"
                          "all" .Values
                          "component" .Values.system.components.frontend
-                         "envs" (list "HTTPD_CONF_PATH_PREFIX_NO_SLASHES")
+                         "envs" (list "HTTPD_CONF_PATH_PREFIX_NO_SLASHES" "HTTPD_CONF_SERVER_NAME" "HTTPD_CONF_STATIC_DIR")
                          "command" "/usr/sbin/httpd"
                          "args" (list "-f" "/etc/apache2/regsys.conf" "-DNO_DETACH" "-DFOREGROUND")
                          "volume" "no" -}}

diff --git a/charts/eurofurence-registration-system/tests/configmap_test.yaml b/charts/eurofurence-registration-system/tests/configmap_test.yaml
@@ -4,6 +4,8 @@ templates:
 tests:
   - it: should create correct configmap
     set:
+      ingress:
+        host: my.domain.example.com
       system:
         public_base_url_domain: https://my.domain.example.com
         public_base_context: 'hello/you'
@@ -486,6 +488,12 @@ tests:
       - equal:
           path: data.HTTPD_CONF_PATH_PREFIX_NO_SLASHES
           value: 'hello/you'
+      - equal:
+          path: data.HTTPD_CONF_SERVER_NAME
+          value: 'my.domain.example.com'
+      - equal:
+          path: data.HTTPD_CONF_STATIC_DIR
+          value: 'reg-frontend'
 
   - it: should not set namespace if unset
     set:

diff --git a/charts/eurofurence-registration-system/tests/deployments_test.yaml b/charts/eurofurence-registration-system/tests/deployments_test.yaml
@@ -585,6 +585,16 @@ tests:
                           configMapKeyRef:
                             name: regsys-cm
                             key: HTTPD_CONF_PATH_PREFIX_NO_SLASHES
+                      - name: HTTPD_CONF_SERVER_NAME
+                        valueFrom:
+                          configMapKeyRef:
+                            name: regsys-cm
+                            key: HTTPD_CONF_SERVER_NAME
+                      - name: HTTPD_CONF_STATIC_DIR
+                        valueFrom:
+                          configMapKeyRef:
+                            name: regsys-cm
+                            key: HTTPD_CONF_STATIC_DIR
         documentIndex: 6
 
   - it: should not set namespace if unset