From dda5bb918d08b37c930bd8db4db9cc414c1c8577 Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Mon, 15 Sep 2025 17:51:57 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(config)=20create=20instance-specif?= =?UTF-8?q?ic=20configuration=20directories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Docker image will now expect the working directory to be set, for example to /app/config/fer for the current (RENATER) configuration. --- docker-compose.yml | 1 + src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl | 1 + src/helm/oidc2fer/templates/satosa_deployment.yaml | 3 +++ src/satosa/{ => config/fer}/internal_attributes.yaml | 0 .../{ => config/fer}/plugins/backends/saml2_backend.yaml | 0 .../fer}/plugins/frontends/openid_connect_frontend.yaml | 0 .../{ => config/fer}/plugins/frontends/ping_frontend.yaml | 0 .../fer}/plugins/microservices/attribute_authorization.yaml | 0 .../fer}/plugins/microservices/attribute_processor.yaml | 0 .../fer}/plugins/microservices/filter_attributes.yaml | 0 .../fer}/plugins/microservices/primary_identifier.yaml | 0 .../{ => config/fer}/plugins/microservices/siret_mapping.yaml | 0 .../fer}/plugins/microservices/static_attributes.yaml | 0 src/satosa/{ => config/fer}/proxy_conf.yaml | 0 src/satosa/{ => config/fer}/static/images/logo.svg | 0 src/satosa/{ => config/fer}/static/index.html | 0 16 files changed, 5 insertions(+) rename src/satosa/{ => config/fer}/internal_attributes.yaml (100%) rename src/satosa/{ => config/fer}/plugins/backends/saml2_backend.yaml (100%) rename src/satosa/{ => config/fer}/plugins/frontends/openid_connect_frontend.yaml (100%) rename src/satosa/{ => config/fer}/plugins/frontends/ping_frontend.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/attribute_authorization.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/attribute_processor.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/filter_attributes.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/primary_identifier.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/siret_mapping.yaml (100%) rename src/satosa/{ => config/fer}/plugins/microservices/static_attributes.yaml (100%) rename src/satosa/{ => config/fer}/proxy_conf.yaml (100%) rename src/satosa/{ => config/fer}/static/images/logo.svg (100%) rename src/satosa/{ => config/fer}/static/index.html (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 0a447ef..2fd9ed2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: volumes: - ./src/satosa:/app - ./docker/files/usr/local/etc/gunicorn/satosa.py:/usr/local/etc/gunicorn/satosa.py + working_dir: /app/config/fer depends_on: - redis diff --git a/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl b/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl index 2d38b2c..d2d7375 100644 --- a/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl +++ b/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl @@ -5,6 +5,7 @@ image: satosa: replicas: 1 + workingDir: /app/config/fer envVars: BASE_URL: https://oidc2fer.127.0.0.1.nip.io GUNICORN_CMD_ARGS: --workers=3 diff --git a/src/helm/oidc2fer/templates/satosa_deployment.yaml b/src/helm/oidc2fer/templates/satosa_deployment.yaml index cd99eec..95fc566 100644 --- a/src/helm/oidc2fer/templates/satosa_deployment.yaml +++ b/src/helm/oidc2fer/templates/satosa_deployment.yaml @@ -38,6 +38,9 @@ spec: command: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.satosa.workingDir }} + workingDir: {{ . | quote }} + {{- end }} {{- with .Values.satosa.args }} args: {{- toYaml . | nindent 12 }} diff --git a/src/satosa/internal_attributes.yaml b/src/satosa/config/fer/internal_attributes.yaml similarity index 100% rename from src/satosa/internal_attributes.yaml rename to src/satosa/config/fer/internal_attributes.yaml diff --git a/src/satosa/plugins/backends/saml2_backend.yaml b/src/satosa/config/fer/plugins/backends/saml2_backend.yaml similarity index 100% rename from src/satosa/plugins/backends/saml2_backend.yaml rename to src/satosa/config/fer/plugins/backends/saml2_backend.yaml diff --git a/src/satosa/plugins/frontends/openid_connect_frontend.yaml b/src/satosa/config/fer/plugins/frontends/openid_connect_frontend.yaml similarity index 100% rename from src/satosa/plugins/frontends/openid_connect_frontend.yaml rename to src/satosa/config/fer/plugins/frontends/openid_connect_frontend.yaml diff --git a/src/satosa/plugins/frontends/ping_frontend.yaml b/src/satosa/config/fer/plugins/frontends/ping_frontend.yaml similarity index 100% rename from src/satosa/plugins/frontends/ping_frontend.yaml rename to src/satosa/config/fer/plugins/frontends/ping_frontend.yaml diff --git a/src/satosa/plugins/microservices/attribute_authorization.yaml b/src/satosa/config/fer/plugins/microservices/attribute_authorization.yaml similarity index 100% rename from src/satosa/plugins/microservices/attribute_authorization.yaml rename to src/satosa/config/fer/plugins/microservices/attribute_authorization.yaml diff --git a/src/satosa/plugins/microservices/attribute_processor.yaml b/src/satosa/config/fer/plugins/microservices/attribute_processor.yaml similarity index 100% rename from src/satosa/plugins/microservices/attribute_processor.yaml rename to src/satosa/config/fer/plugins/microservices/attribute_processor.yaml diff --git a/src/satosa/plugins/microservices/filter_attributes.yaml b/src/satosa/config/fer/plugins/microservices/filter_attributes.yaml similarity index 100% rename from src/satosa/plugins/microservices/filter_attributes.yaml rename to src/satosa/config/fer/plugins/microservices/filter_attributes.yaml diff --git a/src/satosa/plugins/microservices/primary_identifier.yaml b/src/satosa/config/fer/plugins/microservices/primary_identifier.yaml similarity index 100% rename from src/satosa/plugins/microservices/primary_identifier.yaml rename to src/satosa/config/fer/plugins/microservices/primary_identifier.yaml diff --git a/src/satosa/plugins/microservices/siret_mapping.yaml b/src/satosa/config/fer/plugins/microservices/siret_mapping.yaml similarity index 100% rename from src/satosa/plugins/microservices/siret_mapping.yaml rename to src/satosa/config/fer/plugins/microservices/siret_mapping.yaml diff --git a/src/satosa/plugins/microservices/static_attributes.yaml b/src/satosa/config/fer/plugins/microservices/static_attributes.yaml similarity index 100% rename from src/satosa/plugins/microservices/static_attributes.yaml rename to src/satosa/config/fer/plugins/microservices/static_attributes.yaml diff --git a/src/satosa/proxy_conf.yaml b/src/satosa/config/fer/proxy_conf.yaml similarity index 100% rename from src/satosa/proxy_conf.yaml rename to src/satosa/config/fer/proxy_conf.yaml diff --git a/src/satosa/static/images/logo.svg b/src/satosa/config/fer/static/images/logo.svg similarity index 100% rename from src/satosa/static/images/logo.svg rename to src/satosa/config/fer/static/images/logo.svg diff --git a/src/satosa/static/index.html b/src/satosa/config/fer/static/index.html similarity index 100% rename from src/satosa/static/index.html rename to src/satosa/config/fer/static/index.html