From 31417d0297ff46ec19d3e77b4dab24beead90d68 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 9 Jan 2026 09:47:05 +0100
Subject: [PATCH] Adjust photoprism migration marker

---
 photoprism/CHANGELOG.md                         |  2 ++
 photoprism/README.md                            |  8 ++++----
 photoprism/config.yaml                          |  7 ++++---
 photoprism/rootfs/etc/cont-init.d/00-folders.sh |  4 ++++
 photoprism/rootfs/etc/cont-init.d/01-migrate.sh | 16 ++++++++++++++++
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 photoprism/rootfs/etc/cont-init.d/01-migrate.sh

diff --git a/photoprism/CHANGELOG.md b/photoprism/CHANGELOG.md
index f018a491b..2d19b1b95 100644
--- a/photoprism/CHANGELOG.md
+++ b/photoprism/CHANGELOG.md
@@ -1,3 +1,5 @@
+## ubuntu-2025-11-30-3 (2026-01-10)
+- ⚠ MAJOR CHANGE : switch to the new config logic from homeassistant. Your configuration files will have migrated from /config/addons_config/photoprism to a folder only accessible from my Filebrowser addon called /addon_configs/xxx-photoprism. This avoids the addon to mess with your homeassistant configuration folder, and allows to backup the options. Migration of data should be automatic, but update any custom paths or permissions to avoid breakage. Please be sure to update all your links however ! For more information, see here : https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/
 
 ## ubuntu-2025-11-30 (2025-11-30)
 - Update to latest version from photoprism/photoprism
diff --git a/photoprism/README.md b/photoprism/README.md
index 2fa574677..a47e89ccc 100644
--- a/photoprism/README.md
+++ b/photoprism/README.md
@@ -85,6 +85,8 @@ Configurations can be done through the app webUI, except for the following optio
 | `cifspassword` | str | | SMB password for network shares |
 | `cifsdomain` | str | | SMB domain for network shares |
 
+⚠ **Migration notice**: Configuration files now live under `/addon_configs/xxx-photoprism/photoprism/`. The add-on will attempt to migrate files from the old `/config/addons_config/photoprism/` location automatically, but any hard-coded paths, scripts, or backups pointing at the old location will need to be updated. Make a backup before upgrading in case custom paths or permissions cause the migration to fail.
+
 ### Example Configuration
 
 ```yaml
@@ -106,12 +108,12 @@ cifsdomain: "workgroup"
 
 ### Advanced Configuration
 
-Additional options can be configured in `/config/addons_config/photoprism/config.yaml`.
+Additional options can be configured in `/addon_configs/xxx-photoprism/photoprism/config.yaml`.
 Complete list: https://github.com/photoprism/photoprism/blob/develop/docker-compose.yml
 
 ### External Database Setup
 
-For external database, add to `addons_config/photoprism/config.yaml`:
+For external database, add to `/addon_configs/xxx-photoprism/photoprism/config.yaml`:
 
 ```yaml
 PHOTOPRISM_DATABASE_DRIVER: "mysql"
@@ -146,5 +148,3 @@ You can access it via portainer addon or executing `docker exec -it <photoprism
 Create an issue on github
 
 [repository]: https://github.com/alexbelgium/hassio-addons
-
-
diff --git a/photoprism/config.yaml b/photoprism/config.yaml
index 8a8d9ef0b..eadb83343 100644
--- a/photoprism/config.yaml
+++ b/photoprism/config.yaml
@@ -77,15 +77,16 @@ image: ghcr.io/alexbelgium/photoprism-{arch}
 ingress: true
 ingress_stream: true
 map:
+  - addon_config:rw
+  - homeassistant_config:rw
   - media:rw
   - share:rw
-  - config:rw
   - ssl:ro
 name: Photoprism
 options:
   env_vars: []
   BACKUP_PATH: /share/photoprism/backup
-  CONFIG_LOCATION: /config/addons_config/photoprism/config.yaml
+  CONFIG_LOCATION: /config/photoprism/config.yaml
   DB_TYPE: sqlite
   IMPORT_PATH: /share/photoprism/import
   ORIGINALS_PATH: /share/photoprism/originals
@@ -130,5 +131,5 @@ services:
 slug: photoprism
 udev: true
 url: https://github.com/alexbelgium/hassio-addons
-version: "ubuntu-2025-11-30"
+version: "ubuntu-2025-11-30-3"
 video: true
diff --git a/photoprism/rootfs/etc/cont-init.d/00-folders.sh b/photoprism/rootfs/etc/cont-init.d/00-folders.sh
index ef3902389..e81c5d7fc 100755
--- a/photoprism/rootfs/etc/cont-init.d/00-folders.sh
+++ b/photoprism/rootfs/etc/cont-init.d/00-folders.sh
@@ -12,6 +12,8 @@ fi
 
 bashio::log.info "Preparing scripts"
 echo "... creating structure"
+CONFIG_DIR="$(dirname "$(bashio::config "CONFIG_LOCATION")")"
+mkdir -p "$CONFIG_DIR"
 mkdir -p \
     /data/photoprism/originals \
     /data/photoprism/import \
@@ -23,6 +25,8 @@ echo "... setting permissions"
 chmod -R 777 /data/photoprism
 chown -Rf photoprism:photoprism /data/photoprism
 chmod -Rf a+rwx /data/photoprism
+chmod -R 777 "$CONFIG_DIR"
+chown -Rf photoprism:photoprism "$CONFIG_DIR"
 for line in BACKUP_PATH IMPORT_PATH ORIGINALS_PATH STORAGE_PATH; do
     mkdir -p "$line"
     chmod -R 777 "$line"
diff --git a/photoprism/rootfs/etc/cont-init.d/01-migrate.sh b/photoprism/rootfs/etc/cont-init.d/01-migrate.sh
new file mode 100644
index 000000000..49e0d75f3
--- /dev/null
+++ b/photoprism/rootfs/etc/cont-init.d/01-migrate.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+slug=photoprism
+
+if [ -d "/homeassistant/addons_config/$slug" ]; then
+    echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
+    cp -rnf /homeassistant/addons_config/"$slug"/. /config/ || true
+    echo "Migrated to internal config folder accessible at /addon_configs/xxx-$slug" \
+        > "/homeassistant/addons_config/$slug/.migrate"
+fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi