From 737215311f35ad1051e0ffa9af59c2ea1234751a Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Tue, 16 Sep 2025 17:08:02 +0200
Subject: [PATCH 1/2] feat: add oidc_login app

---
 hooks.d/post-installation/murena-theme.sh | 1 +
 slim.Dockerfile                           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/hooks.d/post-installation/murena-theme.sh b/hooks.d/post-installation/murena-theme.sh
index 74a8082c..880e0afc 100755
--- a/hooks.d/post-installation/murena-theme.sh
+++ b/hooks.d/post-installation/murena-theme.sh
@@ -17,6 +17,7 @@ occ app:enable ecloud-theme-helper
 occ app:enable murena-dashboard
 occ app:enable murena_launcher
 occ app:enable snappymail
+occ app:enable oidc_login
 
 occ app:enable notes
 occ app:enable tasks
diff --git a/slim.Dockerfile b/slim.Dockerfile
index a45b228e..27fc197e 100644
--- a/slim.Dockerfile
+++ b/slim.Dockerfile
@@ -8,6 +8,7 @@ ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/g
 ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v7.0.3/murena_launcher-v7.0.3.tar.gz"
 ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v7.1.2/murena-dashboard-v7.1.2.tar.gz"
 ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20250822/snappymail-v2.38.2+murena-20250822.tar.gz"
+ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/3.2.2-4/oidc_login-3.2.2-4.tar.gz"
 
 ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz"
 ARG TASKS_URL="https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz"
@@ -34,6 +35,7 @@ RUN curl -sL ${THEME_HELPER_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
 RUN curl -sL ${LAUNCHER_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
 RUN curl -sL ${DASHBOARD_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
 RUN curl -sL ${SNAPPY_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${OIDC_LOGIN_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
 
 # External apps
 RUN curl -sL ${NOTES_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
-- 
GitLab


From bd9d681849cd0185296e8e284a0ed2be7c2d8de1 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Tue, 16 Sep 2025 17:52:31 +0200
Subject: [PATCH 2/2] feat: dynamic setup of sentry

---
 .env.example                                 | 2 ++
 docker-compose.yml                           | 2 ++
 hooks.d/post-installation/murena-config.json | 4 +++-
 hooks.d/post-installation/murena-theme.sh    | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 79de30b2..716a186b 100644
--- a/.env.example
+++ b/.env.example
@@ -27,3 +27,5 @@ NEXTCLOUD_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/slim
 NEXTCLOUD_ADMIN_USER=admin
 NEXTCLOUD_ADMIN_PASSWORD=@dm1n
 NEXTCLOUD_TRUSTED_DOMAINS=nginx
+SENTRY_DSN=
+SENTRY_PUBLIC_DSN=
diff --git a/docker-compose.yml b/docker-compose.yml
index f303cecd..24af74da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,6 +46,8 @@ services:
       - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
       - MAIL_DOMAIN=${MAIL_DOMAIN}
       - SYSLOG_HOST=syslog
+      - SENTRY_DSN=${SENTRY_DSN}
+      - SENTRY_PUBLIC_DSN=${SENTRY_PUBLIC_DSN}
     volumes:
       - nextcloud:/var/www/html
     depends_on:
diff --git a/hooks.d/post-installation/murena-config.json b/hooks.d/post-installation/murena-config.json
index 1a2b9667..01f37613 100644
--- a/hooks.d/post-installation/murena-config.json
+++ b/hooks.d/post-installation/murena-config.json
@@ -24,6 +24,8 @@
     "preview_max_x": 1024,
     "preview_max_y": 1024,
     "default_phone_region": "FR",
-    "maintenance_window_start": 1
+    "maintenance_window_start": 1,
+    "sentry.dsn": "${SENTRY_DSN}",
+    "sentry.public-dsn": "${SENTRY_PUBLIC_DSN}"
   }
 }
diff --git a/hooks.d/post-installation/murena-theme.sh b/hooks.d/post-installation/murena-theme.sh
index 880e0afc..bd1987a9 100755
--- a/hooks.d/post-installation/murena-theme.sh
+++ b/hooks.d/post-installation/murena-theme.sh
@@ -4,7 +4,8 @@ SCRIPT_DIR=$(dirname "$0")
 PATH=${PATH}:/var/www/html
 
 # Apply configuration
-sed -e "s|\${NEXTCLOUD_LOGFILE}|${NEXTCLOUD_LOGFILE:-/var/www/html/data/nextcloud.log}|g" \
+sed -e "s|\${SENTRY_DSN}|${SENTRY_DSN}|g" \
+    -e "s|\${SENTRY_PUBLIC_DSN}|${SENTRY_PUBLIC_DSN}|g" \
     "${SCRIPT_DIR}/murena-config.json" | occ config:import
 
 # Update theme
-- 
GitLab