diff --git a/README.md b/README.md index 121eb05..64945c6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. -**Shipped version:** 4.2.1 +**Shipped version:** 4.2.2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ad7e703..ba1b7a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Lychee est un outil de gestion de photos gratuit, qui fonctionne sur votre serveur ou votre espace Web. L'installation est une question de secondes. Téléchargez, gérez et partagez des photos comme à partir d'une application native. Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. -**Version incluse :** 4.2.1 +**Version incluse :** 4.2.2 ## Captures d'écran diff --git a/check_process b/check_process index 084364c..5d9cb97 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=2a2fd5b9a9e81ff8e157cf1747418fd11f4211a2 backup_restore=1 multi_instance=1 port_already_use=0 @@ -24,7 +25,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. + ; commit=2a2fd5b9a9e81ff8e157cf1747418fd11f4211a2 + name= Fix linter (#13) 11 Dec 2020 manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/.env.example b/conf/.env.example index ce3c712..8d1f843 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -26,14 +26,14 @@ DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=__DB_NAME__ DB_USERNAME=__DB_NAME__ -DB_PASSWORD=__DB_PASS__ +DB_PASSWORD=__DB_PWD__ DB_LOG_SQL=false TIMEZONE=UTC # folders in which the files will be stored LYCHEE_DIST="__FINALPATH__/public/dist/" -LYCHEE_UPLOADS="__PUBLICPATH__/uploads/" +LYCHEE_UPLOADS="__PUBLIC_PATH__/uploads/" # url to access those files # LYCHEE_DIST_URL="dist/" diff --git a/conf/app.src b/conf/app.src index 066c8f9..62993e9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.2.1/Lychee.zip -SOURCE_SUM=4642fb7ca9f1ff6bad194dfbe175ec2fe8b91ee14bbc8c82644fa9ca80c88820 +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.2.2/Lychee.zip +SOURCE_SUM=9d570abb980d8ad5529eaab235a8dd71586a805e48f532357a390384bab0c38b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e2c2e1e..f7a8ebd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Photo-management-system to manage and share photos.", "fr": "Système de gestion de photos pour gérer et partager des photos." }, - "version": "4.2.1~ynh1", + "version": "4.2.2~ynh1", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/pull_request_template.md b/pull_request_template.md index a7a17b4..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/lychee_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/lychee_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 8528b16..56a6529 100755 --- a/scripts/install +++ b/scripts/install @@ -116,12 +116,7 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar ynh_script_progression --message="Building..." # Setup application config -cp ../conf/.env.example $final_path/.env - -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env" -ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/.env" -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$final_path/.env" -ynh_replace_string --match_string="__PUBLICPATH__" --replace_string="$public_path" --target_file="$final_path/.env" +ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" # Setup application config pushd $final_path diff --git a/scripts/upgrade b/scripts/upgrade index a6cd936..76fbf5a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,6 +68,13 @@ if [ ! -d "$public_path/uploads" ]; then mkdir -p $public_path/uploads fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -147,7 +154,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie ynh_script_progression --message="Installing Composer..." --weight=1 # Upgrade composer itself -ynh_install_composer --phpversion=${phpversion} --workdir=$final_path --install_args="--prefer-source --no-dev" +ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" #================================================= # SETUP APPLICATION CONFIG @@ -155,13 +162,9 @@ ynh_install_composer --phpversion=${phpversion} --workdir=$final_path --install_ ynh_script_progression --message="Building..." ynh_backup_if_checksum_is_different --file="$final_path/.env" -# Setup application config -cp ../conf/.env.example $final_path/.env -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env" -ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/.env" -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$final_path/.env" -ynh_replace_string --match_string="__PUBLICPATH__" --replace_string="$public_path" --target_file="$final_path/.env" +# Setup application config +ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$final_path/.env"