1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lychee_ynh.git synced 2024-09-03 19:36:36 +02:00

Merge branch 'testing' into fix

This commit is contained in:
Éric Gaspar 2021-02-20 19:27:56 +01:00 committed by GitHub
commit 4b885eccd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 20 deletions

View file

@ -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

View file

@ -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

View file

@ -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&

View file

@ -32,7 +32,7 @@ DB_LOG_SQL=false
TIMEZONE=UTC
# folders in which the files will be stored
LYCHEE_DIST="__FINAL_PATH__/public/dist/"
LYCHEE_DIST="__FINALPATH__/public/dist/"
LYCHEE_UPLOADS="__PUBLIC_PATH__/uploads/"
# url to access those files

View file

@ -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

View file

@ -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": {

View file

@ -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!"*

View file

@ -133,13 +133,6 @@ popd
# Setup custom user.css file
cp ../conf/user.css.example $final_path/public/dist/user.css
#=================================================
# STORE THE CONFIG FILE CHECKSUM
#=================================================
# Calculate and store the config file checksum into the app settings
ynh_store_file_checksum "$final_path/.env"
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================

View file

@ -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