diff --git a/photoprism/README.md b/photoprism/README.md index d28d3d1f1..0161ccd79 100644 --- a/photoprism/README.md +++ b/photoprism/README.md @@ -84,7 +84,7 @@ 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. +⚠ **Migration notice**: Configuration files now live under `/addon_configs/xxx-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 @@ -107,12 +107,12 @@ cifsdomain: "workgroup" ### Advanced Configuration -Additional options can be configured in `/addon_configs/xxx-photoprism/photoprism/config.yaml`. +Additional options can be configured in `/addon_configs/xxx-photoprism/config.yaml`. Complete list: https://github.com/photoprism/photoprism/blob/develop/docker-compose.yml ### External Database Setup -For external database, add to `/addon_configs/xxx-photoprism/photoprism/config.yaml`: +For external database, add to `/addon_configs/xxx-photoprism/config.yaml`: ```yaml PHOTOPRISM_DATABASE_DRIVER: "mysql" diff --git a/photoprism/config.yaml b/photoprism/config.yaml index eadb83343..90313fad1 100644 --- a/photoprism/config.yaml +++ b/photoprism/config.yaml @@ -86,7 +86,7 @@ name: Photoprism options: env_vars: [] BACKUP_PATH: /share/photoprism/backup - CONFIG_LOCATION: /config/photoprism/config.yaml + CONFIG_LOCATION: /config DB_TYPE: sqlite IMPORT_PATH: /share/photoprism/import ORIGINALS_PATH: /share/photoprism/originals diff --git a/photoprism/rootfs/etc/cont-init.d/00-folders.sh b/photoprism/rootfs/etc/cont-init.d/00-folders.sh index 01a5374cc..a5e8b933b 100755 --- a/photoprism/rootfs/etc/cont-init.d/00-folders.sh +++ b/photoprism/rootfs/etc/cont-init.d/00-folders.sh @@ -12,7 +12,7 @@ fi bashio::log.info "Preparing scripts" echo "... creating structure" -mkdir -p /config/photoprism +mkdir -p /config mkdir -p \ /data/photoprism/originals \ /data/photoprism/import \ @@ -24,8 +24,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/photoprism -chown -Rf photoprism:photoprism /config/photoprism +chmod -R 777 /config +chown -Rf photoprism:photoprism /config 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 index 170ed4261..7f3191aee 100644 --- a/photoprism/rootfs/etc/cont-init.d/01-migrate.sh +++ b/photoprism/rootfs/etc/cont-init.d/01-migrate.sh @@ -3,8 +3,8 @@ set -e slug=photoprism -new_config_location="/config/photoprism/config.yaml" -new_config_dir="$(dirname "$new_config_location")" +new_config_location="/config" +new_config_dir="$new_config_location" mkdir -p "$new_config_dir" if bashio::config.has_value "CONFIG_LOCATION"; then