From d0c9f2effbbb79135dc527592994638feefacebf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 21:52:44 +0100 Subject: [PATCH 01/78] Update nginx.conf --- conf/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1d7ef8d..8f45254 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,6 +11,10 @@ location ^~ __PATH__/ { index index.php; + # setup for image upload + client_max_body_size 256M; + proxy_max_temp_file_size 1024M; + try_files $uri $uri/ @lychee; location ~ \.php$ { if (!-e $request_filename) { @@ -29,6 +33,7 @@ location ^~ __PATH__/ { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } + location @lychee { rewrite __PATH__/(.*)$ __PATH__/index.php?/$1 last; } From 34b554371f7b5b56ee79433004a80ffbf5c0602e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 22:15:38 +0100 Subject: [PATCH 02/78] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8f45254..a10d1c4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,8 +12,8 @@ location ^~ __PATH__/ { index index.php; # setup for image upload - client_max_body_size 256M; - proxy_max_temp_file_size 1024M; + client_max_body_size 512M; + proxy_max_temp_file_size2048M; try_files $uri $uri/ @lychee; location ~ \.php$ { From 304995a1748eac58013e71cc5b3a4e5ec1a7761f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 23:03:45 +0100 Subject: [PATCH 03/78] Update php-fpm.conf --- conf/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 43fca0c..c1a6f44 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 200M -php_admin_value[post_max_size] = 200M +php_admin_value[upload_max_filesize] = 512M +php_admin_value[post_max_size] = 512M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters From e976ab954eb82fd62cb3a5e6295a184496d91cdd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 23:04:24 +0100 Subject: [PATCH 04/78] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 782fe01..99ab516 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.0.7~ynh1", + "version": "4.0.7~ynh2", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From 69c73aa8db5879080edcd84b7f25c05f44bc6afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 15 Nov 2020 23:17:01 +0100 Subject: [PATCH 05/78] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 703a88c..6922a0c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,7 @@ location ^~ __PATH__/ { # setup for image upload client_max_body_size 512M; - proxy_max_temp_file_size2048M; + proxy_max_temp_file_size 2048M; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; From 2f33ebbb6cd7c256e5508ec462df091ffd2a0597 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 23:19:02 +0100 Subject: [PATCH 06/78] Upgrade PHP to 7.4 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7b7f25e..6bcb25c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=7.3 +YNH_PHP_VERSION=7.4 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From 5f0069718f5bcbecda7707581c7040f6e21a5b3c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 15 Nov 2020 23:46:49 +0100 Subject: [PATCH 07/78] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6bcb25c..7b7f25e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=7.4 +YNH_PHP_VERSION=7.3 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From 42bb313c709b4d07fe442dfb5c406fc6d0e2ac05 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Nov 2020 16:36:37 +0100 Subject: [PATCH 08/78] Update nginx.conf --- conf/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6922a0c..49eb90b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,6 @@ location ^~ __PATH__/ { # setup for image upload client_max_body_size 512M; - proxy_max_temp_file_size 2048M; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; From 0934346b3407b9319eb68a07cfc886e5925c7f42 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Nov 2020 14:31:45 +0100 Subject: [PATCH 09/78] Change versions --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 99ab516..e2f72af 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.0.7~ynh2", + "version": "4.0.7~ynh3", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From 293c9ca5656b8487a7ff6ac122a54aaf3eb7bf43 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 19 Nov 2020 23:40:12 +0100 Subject: [PATCH 10/78] Upgrade to version 4.0.8 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/upgrade | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6954479..49e16d4 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.0.7 +**Shipped version:** 4.0.8 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 8315882..409011c 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.0.7 +**Version incluse :** 4.0.8 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index db225fc..265cd0f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.0.7/Lychee.zip -SOURCE_SUM=cebf61ccac3c9bbf081fefa7dfb287f2ef74f09bbda5ee530ae1e4b1c13d28d7 +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.0.8/Lychee.zip +SOURCE_SUM=107aea88ea20c6cff7e3279354819ecfeffef780197d2d86229d088082cfbf5d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e2f72af..0ab3064 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.0.7~ynh3", + "version": "4.0.8~ynh1", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { diff --git a/scripts/upgrade b/scripts/upgrade index 53e31ec..501878e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,9 +124,9 @@ ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" -( cd $final_path && php$YNH_PHP_VERSION artisan migrate -n --force) -( cd $final_path && php$YNH_PHP_VERSION artisan config:clear -n ) -( cd $final_path && php$YNH_PHP_VERSION artisan config:cache -n ) +( cd $final_path && php$phpversion artisan migrate -n --force ) +( cd $final_path && php$phpversion artisan config:clear -n ) +( cd $final_path && php$phpversion artisan config:cache -n ) ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. From 00c1e09f1b03c1259c82430324d3cdd2ed14ff66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 22 Nov 2020 18:20:24 +0100 Subject: [PATCH 11/78] Storage (#5) - Set the media storage to /home.yunohost.app/lychee Co-authored-by: tituspijean --- conf/.env.example | 2 +- conf/nginx.conf | 4 ++++ conf/php-fpm.conf | 2 +- conf/user.css.example | 14 +++++++++++++ scripts/_common.sh | 48 +++---------------------------------------- scripts/backup | 3 ++- scripts/install | 48 ++++++++++++++++++++++++++----------------- scripts/remove | 10 +++++++++ scripts/restore | 16 ++++++++++++--- scripts/upgrade | 19 ++++++++++++++--- 10 files changed, 93 insertions(+), 73 deletions(-) create mode 100644 conf/user.css.example diff --git a/conf/.env.example b/conf/.env.example index 7b8e2a8..dcfeecc 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -33,7 +33,7 @@ TIMEZONE=UTC # folders in which the files will be stored #LYCHEE_DIST="/var/www/__APP__/public/dist/" -#LYCHEE_UPLOADS="/var/www/__APP__/public/uploads/" +LYCHEE_UPLOADS="/home/yunohost.app/__APP__/uploads/" # url to access those files # LYCHEE_DIST_URL="dist/" diff --git a/conf/nginx.conf b/conf/nginx.conf index 49eb90b..e0885e7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -30,6 +30,10 @@ location ^~ __PATH__/ { } + location __PATH__/uploads/ { + alias __PUBLIC_PATH__/uploads/ ; + } + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index c1a6f44..a4d5b1e 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -426,5 +426,5 @@ php_admin_value[post_max_size] = 512M ; Other common parameters php_admin_value[max_execution_time] = 200 ; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M +php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On diff --git a/conf/user.css.example b/conf/user.css.example new file mode 100644 index 0000000..de4fa80 --- /dev/null +++ b/conf/user.css.example @@ -0,0 +1,14 @@ +/* Disable the 'zoom' animation while browsing pictures */ +#imageview #image { + transition: none !important; + animation-name: none !important; + animation-duration: 0 !important; +} + +/* Hide smart albums */ +/* +[data-id="0"] { display:none; } +[data-id="s"] { display:none; } +[data-id="f"] { display:none; } +[data-id="r"] { display:none; } +*/ diff --git a/scripts/_common.sh b/scripts/_common.sh index 7b7f25e..7bb130c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,9 @@ YNH_PHP_VERSION=7.3 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" +# needed for raw upload and video playback +pkg_dependencies="ufraw-batch ffmpeg" + #================================================= # EXPERIMENTAL HELPERS #================================================= @@ -71,48 +74,3 @@ ynh_install_composer () { ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ || ynh_die "Unable to update core dependencies with Composer." } - - - - -# Install or update the main directory yunohost.multimedia -# -# usage: ynh_multimedia_build_main_dir -ynh_multimedia_build_main_dir () { - local ynh_media_release="v1.2" - local checksum="806a827ba1902d6911095602a9221181" - - # Download yunohost.multimedia scripts - wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz - - # Check the control sum - echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \ - || ynh_die "Corrupt source" - - # Check if the package acl is installed. Or install it. - ynh_package_is_installed 'acl' \ - || ynh_package_install acl - - # Extract - mkdir yunohost.multimedia-master - tar -xf ${ynh_media_release}.tar.gz -C yunohost.multimedia-master --strip-components 1 - ./yunohost.multimedia-master/script/ynh_media_build.sh -} - -# Add a directory in yunohost.multimedia -# This "directory" will be a symbolic link to a existing directory. -# -# usage: ynh_multimedia_addfolder "Source directory" "Destination directory" -# -# | arg: -s, --source_dir= - Source directory - The real directory which contains your medias. -# | arg: -d, --dest_dir= - Destination directory - The name and the place of the symbolic link, relative to "/home/yunohost.multimedia" -ynh_multimedia_addfolder () { - # Declare an array to define the options of this helper. - declare -Ar args_array=( [s]=source_dir= [d]=dest_dir= ) - local source_dir - local dest_dir - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - - ./yunohost.multimedia-master/script/ynh_media_addfolder.sh --source="$source_dir" --dest="$dest_dir" -} diff --git a/scripts/backup b/scripts/backup index e7ee942..e5ee3e8 100755 --- a/scripts/backup +++ b/scripts/backup @@ -24,6 +24,7 @@ ynh_print_info --message="Backing up Lychee..." app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) +public_path=$(ynh_app_setting_get --app=$app --key=public_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) @@ -38,7 +39,7 @@ ynh_backup --src_path="$final_path" # BACKUP MEDIA FOLDER #================================================= -#ynh_backup --src_path="/home/yunohost.$app" --is_big +ynh_backup --src_path="$public_path" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/install b/scripts/install index 33d3013..9989dc8 100755 --- a/scripts/install +++ b/scripts/install @@ -33,6 +33,9 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +public_path=/home/yunohost.app/$app +test ! -e "${public_path}" || ynh_die --message="${public_path} already exists" + # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -45,6 +48,13 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing dependencies..." --weight=3 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE A MYSQL DATABASE #================================================= @@ -62,7 +72,18 @@ ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir=$final_path + +#================================================= +# CREATE DIRECTORIES +#================================================= + +ynh_app_setting_set --app=$app --key=public_path --value=$public_path +mkdir -p ${public_path}/uploads +mkdir -p ${public_path}/uploads/{big,import,medium,raw,small,thumb} + +# Create a dedicated NGINX config +ynh_add_nginx_config "public_path" #================================================= # NGINX CONFIGURATION @@ -70,14 +91,7 @@ ynh_setup_source --dest_dir="$final_path" ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# YUNOHOST MULTIMEDIA INTEGRATION -#================================================= -#ynh_script_progression --message="Adding multimedia directories..." --weight=2 - -#ynh_multimedia_build_main_dir +ynh_add_nginx_config "public_path" #================================================= # CREATE DEDICATED USER @@ -102,7 +116,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 # Install composer -ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" +ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" #================================================= # BUILDING @@ -122,6 +136,9 @@ cd $final_path && php$phpversion artisan migrate -n --force cd $final_path && php$phpversion artisan config:clear -n cd $final_path && php$phpversion artisan config:cache -n +# Setup custum user.css file +#cp ../conf/user.css.example $final_path/public/dist/user.css + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= @@ -130,21 +147,14 @@ ynh_script_progression --message="Storing the config file checksum..." # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$final_path/.env" -#================================================= -# CREATE DIRECTORIES -#================================================= - -#mkdir -p /home/yunohost.${app}/uploads -#mkdir -p /home/yunohost.${app}/uploads/{big,medium,small,thumb,import} - #================================================= # SECURE FILES AND DIRECTORIES #================================================= # Set permissions to app files chown -R $app: $final_path -#chown -R $app: /home/yunohost.${app} -#chmod -R 750 /home/yunohost.${app} +chown -R $app: ${public_path} +chmod -R 755 ${public_path} #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 17714d2..17553ec 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name @@ -30,6 +31,7 @@ ynh_script_progression --message="Removing Lychee main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" +ynh_secure_remove --file="$public_path" #================================================= # REMOVE THE MYSQL DATABASE @@ -39,6 +41,14 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=2 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=1 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index c0296af..fe5f82e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,6 +25,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) @@ -65,10 +66,10 @@ ynh_system_user_create --username=$app #================================================= # RESTORE DATA #================================================= -#ynh_script_progression --message="Restoring Lychee data..." +ynh_script_progression --message="Restoring Lychee data..." # Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup. -#ynh_restore_file --origin_path="/home/yunohost.$app" --not_mandatory +ynh_restore_file --origin_path=$public_path --not_mandatory #================================================= # RESTORE USER RIGHTS @@ -76,7 +77,16 @@ ynh_system_user_create --username=$app # Restore permissions on app files chown -R $app: $final_path -#chmod -R 750 /home/yunohost.$app/{uploads,data} +chown -R $app: $public_path +chmod -R 750 $public_path + +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=7 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 501878e..dfe8903 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) @@ -56,6 +57,16 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# If public_path doesn't exist, create it +if [ -z "$public_path" ]; then + public_path=/home/yunohost.app/$app + ynh_app_setting_set --app=$app --key=public_path --value=$public_path +fi + +if [ ! -d "$public_path/uploads" ]; then + mkdir -p $public_path/uploads +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -71,10 +82,11 @@ ynh_clean_setup () { ynh_abort_if_errors #================================================= -# CHECK THE PATH +# UPGRADE DEPENDENCIES #================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=3 -path_url=$(ynh_normalize_url_path --path_url=$path_url) +ynh_install_app_dependencies $pkg_dependencies #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -138,7 +150,8 @@ ynh_store_file_checksum --file="$final_path/.env" # Set permissions on app files chown -R $app: $final_path -#chmod -R 750 /home/yunohost.$app/{uploads,data} +chown -R $app: $public_path +chmod -R 750 $public_path #================================================= # RELOAD NGINX From 1f3285efcab10b696e5c5d2e2cd1038c55cbed7f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 10 Dec 2020 21:03:53 +0100 Subject: [PATCH 12/78] fix linter warnings --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7bb130c..54392f4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -68,7 +68,7 @@ ynh_install_composer () { curl -sS https://getcomposer.org/installer \ | COMPOSER_HOME="$workdir/.composer" \ php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ - || ynh_die "Unable to install Composer." + || ynh_die "Unable to install Composer." 2>&1 # update dependencies to create composer.lock ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ From b4b4a25af590bc6b68fd334aeba195c8f79924c7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 10 Dec 2020 21:04:13 +0100 Subject: [PATCH 13/78] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0ab3064..c20309c 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.0.8~ynh1", + "version": "4.0.8~ynh2", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From 95b0ba42cd38e1a00d18b16326d53321212ef359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Dec 2020 21:07:15 +0100 Subject: [PATCH 14/78] Add user.css settings (#7) * Update user.css.example --- check_process | 3 --- conf/.env.example | 2 +- conf/user.css.example | 9 +++++++++ issue_template.md | 2 +- scripts/install | 18 ++++++++++-------- scripts/upgrade | 8 +++++--- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 397e83b..084364c 100644 --- a/check_process +++ b/check_process @@ -20,9 +20,6 @@ multi_instance=1 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/.env.example b/conf/.env.example index dcfeecc..dbf7bd6 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -32,7 +32,7 @@ DB_LOG_SQL=false TIMEZONE=UTC # folders in which the files will be stored -#LYCHEE_DIST="/var/www/__APP__/public/dist/" +LYCHEE_DIST="__FINALPATH__/public/dist/" LYCHEE_UPLOADS="/home/yunohost.app/__APP__/uploads/" # url to access those files diff --git a/conf/user.css.example b/conf/user.css.example index de4fa80..b6ed836 100644 --- a/conf/user.css.example +++ b/conf/user.css.example @@ -12,3 +12,12 @@ [data-id="f"] { display:none; } [data-id="r"] { display:none; } */ + +/* Make the diadnostic font bigger */ +.settings_view p, .settings_view a, .settings_view input, +.sharing_view p, .sharing_view a, .sharing_view input, .sharing_view option, +.users_view p, .users_view a, .users_view input, .users_view option, +.logs_diagnostics_view pre { + font-size: 12pt; + line-height: 14pt; +} diff --git a/issue_template.md b/issue_template.md index 8d8a7db..7e9710a 100644 --- a/issue_template.md +++ b/issue_template.md @@ -22,7 +22,7 @@ about: When creating a bug report, please use the following template to provide - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* diff --git a/scripts/install b/scripts/install index 9989dc8..477f364 100755 --- a/scripts/install +++ b/scripts/install @@ -129,20 +129,22 @@ 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="__APP__" --replace_string="$app" --target_file="$final_path/.env" +ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$final_path/.env" -# setup application config -cd $final_path && php$phpversion artisan key:generate -n --force --env -cd $final_path && php$phpversion artisan migrate -n --force -cd $final_path && php$phpversion artisan config:clear -n -cd $final_path && php$phpversion artisan config:cache -n +# Setup application config +pushd "$final_path" + php$phpversion artisan key:generate -n --force --env + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n +popd -# Setup custum user.css file -#cp ../conf/user.css.example $final_path/public/dist/user.css +# Setup custom user.css file +cp ../conf/user.css.example $final_path/public/dist/user.css #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= -ynh_script_progression --message="Storing the config file checksum..." # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$final_path/.env" diff --git a/scripts/upgrade b/scripts/upgrade index dfe8903..f80ac80 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,9 +136,11 @@ ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" -( cd $final_path && php$phpversion artisan migrate -n --force ) -( cd $final_path && php$phpversion artisan config:clear -n ) -( cd $final_path && php$phpversion artisan config:cache -n ) +pushd "$final_path" + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n +popd ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. From 89493a4d39d8783944c2bf2a908699948d614de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Dec 2020 21:10:17 +0100 Subject: [PATCH 15/78] Fix linter warning (#9) --- manifest.json | 4 ++++ scripts/_common.sh | 2 +- scripts/install | 10 ---------- scripts/upgrade | 7 ------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/manifest.json b/manifest.json index c20309c..e462363 100644 --- a/manifest.json +++ b/manifest.json @@ -50,6 +50,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Lychee sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/_common.sh b/scripts/_common.sh index 54392f4..0114157 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -65,7 +65,7 @@ ynh_install_composer () { install_args="${install_args:-}" composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" - curl -sS https://getcomposer.org/installer \ + curl -sS https://getcomposer.org/installer 2>&1 \ | COMPOSER_HOME="$workdir/.composer" \ php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ || ynh_die "Unable to install Composer." 2>&1 diff --git a/scripts/install b/scripts/install index 477f364..56aa2cf 100755 --- a/scripts/install +++ b/scripts/install @@ -85,14 +85,6 @@ mkdir -p ${public_path}/uploads/{big,import,medium,raw,small,thumb} # Create a dedicated NGINX config ynh_add_nginx_config "public_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config "public_path" - #================================================= # CREATE DEDICATED USER #================================================= @@ -166,8 +158,6 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission "main" --add "visitors" fi diff --git a/scripts/upgrade b/scripts/upgrade index f80ac80..4a11512 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,13 +81,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=3 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From c75e7838c5cd95aba3558a39a37630bea1dea315 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 11 Dec 2020 21:20:06 +0100 Subject: [PATCH 16/78] Update upgrade --- scripts/upgrade | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4a11512..b3e9225 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,10 +101,17 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=6 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app @@ -112,7 +119,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" From 91fb934ed9df9f9584ac0ec6cc9b2746d411bd8e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 11 Dec 2020 21:43:04 +0100 Subject: [PATCH 17/78] Add extra_php-fpm config --- conf/extra_php-fpm.conf | 7 + conf/php-fpm.conf | 430 ---------------------------------------- scripts/install | 2 +- scripts/remove | 2 +- scripts/upgrade | 2 +- 5 files changed, 10 insertions(+), 433 deletions(-) create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..ad8b82c --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,7 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 512M +php_admin_value[post_max_size] = 512M +php_admin_value[memory_limit] = 256M +php_admin_value[post_max_size] = 512M +php_admin_value[max_execution_time] = 200 diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index a4d5b1e..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __FINALPATH__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 512M -php_admin_value[post_max_size] = 512M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -php_admin_value[max_execution_time] = 200 -; php_admin_value[max_input_time] = 300 -php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On diff --git a/scripts/install b/scripts/install index 56aa2cf..dc24b26 100755 --- a/scripts/install +++ b/scripts/install @@ -99,7 +99,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/remove b/scripts/remove index 17553ec..273780a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -31,7 +31,7 @@ ynh_script_progression --message="Removing Lychee main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" -ynh_secure_remove --file="$public_path" +#ynh_secure_remove --file="$public_path" #================================================= # REMOVE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index b3e9225..5fb0c73 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE From 6799db87338236e694c7ebb7829976658da04cb9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 11 Dec 2020 21:48:12 +0100 Subject: [PATCH 18/78] Fix --- conf/.env.example | 2 +- conf/nginx.conf | 2 +- scripts/install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index dbf7bd6..ce3c712 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -33,7 +33,7 @@ TIMEZONE=UTC # folders in which the files will be stored LYCHEE_DIST="__FINALPATH__/public/dist/" -LYCHEE_UPLOADS="/home/yunohost.app/__APP__/uploads/" +LYCHEE_UPLOADS="__PUBLICPATH__/uploads/" # url to access those files # LYCHEE_DIST_URL="dist/" diff --git a/conf/nginx.conf b/conf/nginx.conf index e0885e7..b1dd405 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -31,7 +31,7 @@ location ^~ __PATH__/ { } location __PATH__/uploads/ { - alias __PUBLIC_PATH__/uploads/ ; + alias __PUBLIC_PATH__/uploads/ ; } # Include SSOWAT user panel. diff --git a/scripts/install b/scripts/install index dc24b26..4fb58a3 100755 --- a/scripts/install +++ b/scripts/install @@ -120,8 +120,8 @@ 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="__APP__" --replace_string="$app" --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 pushd "$final_path" From 873cdba8784039e14e4a859b8e2cdd6667695542 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 15 Dec 2020 14:25:55 +0100 Subject: [PATCH 19/78] Add custom CSS --- conf/user.css.example | 23 +++++++++++++++++++++++ scripts/_common.sh | 2 +- scripts/install | 13 +++++++++---- scripts/upgrade | 11 ++++++++--- 4 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 conf/user.css.example diff --git a/conf/user.css.example b/conf/user.css.example new file mode 100644 index 0000000..5b8bba5 --- /dev/null +++ b/conf/user.css.example @@ -0,0 +1,23 @@ +/* Disable the 'zoom' animation while browsing pictures */ +#imageview #image { + transition: none !important; + animation-name: none !important; + animation-duration: 0 !important; +} + +/* Hide smart albums */ +/* +[data-id="0"] { display:none; } +[data-id="s"] { display:none; } +[data-id="f"] { display:none; } +[data-id="r"] { display:none; } +*/ + +/* Make the diadnostic font bigger */ +.settings_view p, .settings_view a, .settings_view input, +.sharing_view p, .sharing_view a, .sharing_view input, .sharing_view option, +.users_view p, .users_view a, .users_view input, .users_view option, +.logs_diagnostics_view pre { + font-size: 12pt; + line-height: 14pt; +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index f940aae..4d0da3d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -62,7 +62,7 @@ ynh_install_composer () { install_args="${install_args:-}" composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" - curl -sS https://getcomposer.org/installer \ + curl -sS https://getcomposer.org/installer 2>&1 \ | COMPOSER_HOME="$workdir/.composer" \ php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ || ynh_die "Unable to install Composer." diff --git a/scripts/install b/scripts/install index 33d3013..350030e 100755 --- a/scripts/install +++ b/scripts/install @@ -117,10 +117,15 @@ ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --tar ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$final_path/.env" # setup application config -cd $final_path && php$phpversion artisan key:generate -n --force --env -cd $final_path && php$phpversion artisan migrate -n --force -cd $final_path && php$phpversion artisan config:clear -n -cd $final_path && php$phpversion artisan config:cache -n +pushd "$final_path" + php$phpversion artisan key:generate -n --force --env + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n +popd + +# Setup custom user.css file +cp ../conf/user.css.example $final_path/public/dist/user.css #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 1d0067a..27c2064 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,14 +118,19 @@ ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" -( cd $final_path && php$phpversion artisan migrate -n --force ) -( cd $final_path && php$phpversion artisan config:clear -n ) -( cd $final_path && php$phpversion artisan config:cache -n ) +pushd "$final_path" + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n +popd ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$final_path/.env" +# Setup custom user.css file +cp ../conf/user.css.example $final_path/public/dist/user.css + #================================================= # SECURE FILES AND DIRECTORIES #================================================= From 3a37d0ff7ce5b07487614005e115556e03e1fbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:36:43 +0100 Subject: [PATCH 20/78] Use SVG badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49e16d4..ee594d4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Lychee for YunoHost [![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) -[![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee) +[![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Lire ce readme en français.](./README_fr.md)* From d98ce5fc843257a214348c7f5d875a3b8699da16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:37:05 +0100 Subject: [PATCH 21/78] Use SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 409011c..af1ebf4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Lychee pour YunoHost [![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) -[![Installer Lychee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee) +[![Installer Lychee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) *[Read this readme in english.](./README.md)* From c39b77c06d4320250ce3d4e4262bc39107505aa8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 15:45:42 +0100 Subject: [PATCH 22/78] fix --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 49e16d4..0bac5ff 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.0.8 +**Shipped version:** 4.2.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 409011c..2826b39 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.0.8 +**Version incluse :** 4.2.1 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 265cd0f..066c8f9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.0.8/Lychee.zip -SOURCE_SUM=107aea88ea20c6cff7e3279354819ecfeffef780197d2d86229d088082cfbf5d +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.2.1/Lychee.zip +SOURCE_SUM=4642fb7ca9f1ff6bad194dfbe175ec2fe8b91ee14bbc8c82644fa9ca80c88820 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e462363..e2c2e1e 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.0.8~ynh2", + "version": "4.2.1~ynh1", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { From d0d767a4385284f1c59a92f2bd396cd8b05bb524 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 15:50:48 +0100 Subject: [PATCH 23/78] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f940aae..74baf06 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=7.3 +YNH_PHP_VERSION=7.4 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From d3031cd14aaa40a22d6abdf3be9e95cb7668a35d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 16:00:44 +0100 Subject: [PATCH 24/78] Update upgrade --- scripts/upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1d0067a..17f2a93 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,13 +114,13 @@ ynh_add_fpm_config --package="$extra_php_dependencies" ynh_script_progression --message="Installing Composer..." --weight=10 # Install Composer -ynh_install_composer -ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" +ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" -( cd $final_path && php$phpversion artisan migrate -n --force ) -( cd $final_path && php$phpversion artisan config:clear -n ) -( cd $final_path && php$phpversion artisan config:cache -n ) +cd $final_path && php$phpversion artisan key:generate -n --force --env +cd $final_path && php$phpversion artisan migrate -n --force +cd $final_path && php$phpversion artisan config:clear -n +cd $final_path && php$phpversion artisan config:cache -n ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. From 72d1696dba097ac997b592566b47cd38ad326dbc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 16:08:42 +0100 Subject: [PATCH 25/78] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 74baf06..f7719d7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 +readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.8 # Declare the actual composer version to use. # A packager willing to use another version of composer can override the variable into its _common.sh. YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} From dda97a4b2b12f8fee84fd47a2801a91b9bca0db7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 16:09:51 +0100 Subject: [PATCH 26/78] Update backup --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index e7ee942..65067e1 100755 --- a/scripts/backup +++ b/scripts/backup @@ -38,7 +38,7 @@ ynh_backup --src_path="$final_path" # BACKUP MEDIA FOLDER #================================================= -#ynh_backup --src_path="/home/yunohost.$app" --is_big +ynh_backup --src_path="/home/yunohost.$app" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION From 48744ce986adbcfae9dccbdc43d484fb2fb79ec9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 12:54:32 +0100 Subject: [PATCH 27/78] Update upgrade --- scripts/upgrade | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 17f2a93..9068e54 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -117,10 +117,7 @@ ynh_script_progression --message="Installing Composer..." --weight=10 ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" -cd $final_path && php$phpversion artisan key:generate -n --force --env cd $final_path && php$phpversion artisan migrate -n --force -cd $final_path && php$phpversion artisan config:clear -n -cd $final_path && php$phpversion artisan config:cache -n ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. From 91cae0406f6cec8bf26733987df031690927913d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 12:57:15 +0100 Subject: [PATCH 28/78] Fix --- scripts/install | 12 +++++++----- scripts/upgrade | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 33d3013..11f2536 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 # Install composer -ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" +ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--prefer-source --no-dev" #================================================= # BUILDING @@ -117,10 +117,12 @@ ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --tar ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$final_path/.env" # setup application config -cd $final_path && php$phpversion artisan key:generate -n --force --env -cd $final_path && php$phpversion artisan migrate -n --force -cd $final_path && php$phpversion artisan config:clear -n -cd $final_path && php$phpversion artisan config:cache -n +pushd $final_path + hp$phpversion artisan key:generate -n --force --env + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n +popd #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 9068e54..6deb4bd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -117,7 +117,9 @@ ynh_script_progression --message="Installing Composer..." --weight=10 ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" -cd $final_path && php$phpversion artisan migrate -n --force +pushd $final_path + php$phpversion artisan migrate #-n --force +popd ynh_backup_if_checksum_is_different --file="$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. From 20f243c43351e8532f166de01cf7a3ecf18c5e82 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 13:00:32 +0100 Subject: [PATCH 29/78] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 11f2536..4d7ea9b 100755 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,7 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil # setup application config pushd $final_path - hp$phpversion artisan key:generate -n --force --env + php$phpversion artisan key:generate -n --force --env php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n From 6059249fbc703f4ceb92192dc5348175ed8f4090 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 13:35:33 +0100 Subject: [PATCH 30/78] Fix --- scripts/install | 2 +- scripts/upgrade | 50 ++++++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/scripts/install b/scripts/install index 4d7ea9b..a733af3 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 # Install composer -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--prefer-source --no-dev" +ynh_install_composer --workdir="$final_path" --install_args="--prefer-source --no-dev" #================================================= # BUILDING diff --git a/scripts/upgrade b/scripts/upgrade index 6deb4bd..30c0319 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -78,8 +78,39 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 + + # Create a temporary directory + tmpdir="$(mktemp -d)" + + # Backup the config file in the temp dir + cp -a "$final_path/dist/user.css" "$tmpdir/user.css" + cp -a "$final_path/uploads" "$tmpdir/uploads" + + # Remove the app directory securely + ynh_secure_remove --file="$final_path" + # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" + + # Copy the admin saved settings from tmp directory to final path + cp -a "$tmpdiruser.css" "$final_path/config/dist/user.css" + cp -a "$tmpdir/uploads" "$final_path/uploads" + + # Remove the tmp directory securely + ynh_secure_remove --file="$tmpdir" + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" + + ynh_install_composer --workdir="$final_path" --install_args="--prefer-source --no-dev" + + pushd $final_path + php$phpversion artisan migrate -n --force + popd + + ynh_backup_if_checksum_is_different --file="$final_path/.env" + # Recalculate and store the checksum of the file for the next upgrade. + ynh_store_file_checksum --file="$final_path/.env" fi #================================================= @@ -106,25 +137,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" -#================================================= -# SPECIFIC UPGRADE -#================================================= -# INSTALL AND INITIALIZE COMPOSER -#================================================= -ynh_script_progression --message="Installing Composer..." --weight=10 - -# Install Composer - -ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" - -pushd $final_path - php$phpversion artisan migrate #-n --force -popd - -ynh_backup_if_checksum_is_different --file="$final_path/.env" -# Recalculate and store the checksum of the file for the next upgrade. -ynh_store_file_checksum --file="$final_path/.env" - #================================================= # SECURE FILES AND DIRECTORIES #================================================= From 041016d3372a837afa370e3c0a87e9f35c2aa7f9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 13:42:06 +0100 Subject: [PATCH 31/78] Fix --- scripts/install | 6 +++--- scripts/upgrade | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 4fb58a3..353dac6 100755 --- a/scripts/install +++ b/scripts/install @@ -147,18 +147,18 @@ ynh_store_file_checksum "$final_path/.env" # Set permissions to app files chown -R $app: $final_path -chown -R $app: ${public_path} +chown -R $app: $public_path chmod -R 755 ${public_path} #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5fb0c73..6e32d54 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,7 +136,7 @@ ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" -pushd "$final_path" +pushd $final_path php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n php$phpversion artisan config:cache -n From 7aa88d2366182bee3dd418fcb21abb9c7b1d20c4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 13:55:06 +0100 Subject: [PATCH 32/78] Update upgrade --- scripts/upgrade | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 07bc740..d8c7436 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,7 +94,7 @@ then tmpdir="$(mktemp -d)" # Backup the config file in the temp dir - cp -a "$final_path/dist/user.css" "$tmpdir/user.css" + cp -a "$final_path/public/dist/user.css" "$tmpdir/user.css" # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -103,14 +103,11 @@ then ynh_setup_source --dest_dir="$final_path" # Copy the admin saved settings from tmp directory to final path - cp -a "$tmpdiruser.css" "$final_path/config/dist/user.css" + cp -a "$tmpdiruser.css" "$final_path/public/dist/user.css" # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" - ynh_install_composer --workdir="$final_path" --install_args="--prefer-source --no-dev" pushd $final_path From 92d842e84c7ae708fb0043a45346ae35b3c4986c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 14:08:12 +0100 Subject: [PATCH 33/78] Update remove --- scripts/remove | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 273780a..a49c11b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -31,7 +31,9 @@ ynh_script_progression --message="Removing Lychee main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" -#ynh_secure_remove --file="$public_path" + +# Remove data directory securely +ynh_secure_remove --file="$public_path" #================================================= # REMOVE THE MYSQL DATABASE From cd265c2067798df23cf78b867103bab1503fb868 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 14:23:34 +0100 Subject: [PATCH 34/78] Fix --- scripts/restore | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index fe5f82e..9cabb9a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -69,7 +69,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Restoring Lychee data..." # Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup. -ynh_restore_file --origin_path=$public_path --not_mandatory +ynh_restore_file --origin_path="$public_path" --not_mandatory #================================================= # RESTORE USER RIGHTS diff --git a/scripts/upgrade b/scripts/upgrade index d8c7436..f654f92 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ then ynh_setup_source --dest_dir="$final_path" # Copy the admin saved settings from tmp directory to final path - cp -a "$tmpdiruser.css" "$final_path/public/dist/user.css" + cp -a "$tmpdir/user.css" "$final_path/public/dist/user.css" # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" From dd2de0ef5d92de7f1f7b3d47a6c2ec5d75d842a3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 15:06:58 +0100 Subject: [PATCH 35/78] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f654f92..7b5d5ec 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,7 +155,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie # Set permissions on app files chown -R $app: $final_path -chown -R $app: $public_path +#chown -R $app: $public_path chmod -R 750 $public_path #================================================= From 40f7b069c23272328b9c66c2398dd4029fab57dd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 15:13:26 +0100 Subject: [PATCH 36/78] Update upgrade --- scripts/upgrade | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7b5d5ec..66bd828 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,15 +108,11 @@ then # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" - ynh_install_composer --workdir="$final_path" --install_args="--prefer-source --no-dev" + ynh_install_composer --workdir="$final_path" --install_args="--no-dev" pushd $final_path - php$phpversion artisan migrate -n --force + php$phpversion artisan migrate #-n --force popd - - ynh_backup_if_checksum_is_different --file="$final_path/.env" - # Recalculate and store the checksum of the file for the next upgrade. - ynh_store_file_checksum --file="$final_path/.env" fi #================================================= @@ -150,6 +146,23 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +#================================================= +# BUILDING +#================================================= +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" + +# Recalculate and store the checksum of the file for the next upgrade. +ynh_store_file_checksum --file="$final_path/.env" + # SECURE FILES AND DIRECTORIES #================================================= From ec4cf47c85be14a467ba8bdf2712bf8a3850c817 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 18:12:33 +0100 Subject: [PATCH 37/78] Update upgrade --- scripts/upgrade | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 66bd828..db68bf0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,11 +108,11 @@ then # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" - ynh_install_composer --workdir="$final_path" --install_args="--no-dev" + # ynh_install_composer --workdir="$final_path" --install_args="--no-dev" - pushd $final_path - php$phpversion artisan migrate #-n --force - popd + # pushd $final_path + # php$phpversion artisan migrate #-n --force + # popd fi #================================================= @@ -146,6 +146,25 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +#================================================= +# INSTALL AND INITIALIZE COMPOSER +#================================================= +ynh_script_progression --message="Installing Composer..." --weight=10 + +# Install Composer +ynh_install_composer + +ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" + +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=4 + +( cd $final_path && php$phpversion artisan migrate -n --force ) +( cd $final_path && php$phpversion artisan config:clear -n ) +( cd $final_path && php$phpversion artisan config:cache -n ) +fi + #================================================= # BUILDING #================================================= From aa9a98ca6dcbed5b5aa7d7c46aca98df774b22ce Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 18:32:14 +0100 Subject: [PATCH 38/78] Update upgrade --- scripts/upgrade | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index db68bf0..dbd6c15 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -159,14 +159,15 @@ ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 - -( cd $final_path && php$phpversion artisan migrate -n --force ) -( cd $final_path && php$phpversion artisan config:clear -n ) -( cd $final_path && php$phpversion artisan config:cache -n ) + pushd $final_path + php artisan migrate -n #--force + #php$phpversion artisan config:clear -n + #php$phpversion artisan config:cache -n + popd fi #================================================= -# BUILDING +# SETUP APPLICATION CONFIG #================================================= ynh_script_progression --message="Building..." From a997f1e5f6cce1287395bd32523301ccf25b3b2f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 28 Jan 2021 19:03:15 +0100 Subject: [PATCH 39/78] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index dbd6c15..e0356b1 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie ynh_script_progression --message="Installing Composer..." --weight=10 # Install Composer -ynh_install_composer +ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" From f38a5efead842e24b04133cf1c553a3dcf70d830 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 29 Jan 2021 22:01:49 +0100 Subject: [PATCH 40/78] Update upgrade --- scripts/upgrade | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e0356b1..b462dca 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,12 +107,6 @@ then # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" - - # ynh_install_composer --workdir="$final_path" --install_args="--no-dev" - - # pushd $final_path - # php$phpversion artisan migrate #-n --force - # popd fi #================================================= @@ -146,26 +140,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" -#================================================= -# INSTALL AND INITIALIZE COMPOSER -#================================================= -ynh_script_progression --message="Installing Composer..." --weight=10 - -# Install Composer -ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" - -ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" - -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=4 - pushd $final_path - php artisan migrate -n #--force - #php$phpversion artisan config:clear -n - #php$phpversion artisan config:cache -n - popd -fi - #================================================= # SETUP APPLICATION CONFIG #================================================= @@ -183,6 +157,29 @@ ynh_replace_string --match_string="__PUBLICPATH__" --replace_string="$public_pat # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$final_path/.env" +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +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" + +#================================================= +# INSTALL AND INITIALIZE COMPOSER +#================================================= + +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 + pushd $final_path + php$phpversion artisan migrate --no-interaction + #php$phpversion artisan config:clear --no-interaction + #php$phpversion artisan config:cache --no-interaction + popd +fi + +#================================================= # SECURE FILES AND DIRECTORIES #================================================= From a24c8d74d58a9196860d92a454715afb943dc92f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 14:03:21 +0100 Subject: [PATCH 41/78] Update upgrade --- scripts/upgrade | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index b462dca..5f2b821 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -140,6 +140,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +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" + #================================================= # SETUP APPLICATION CONFIG #================================================= @@ -157,14 +165,6 @@ ynh_replace_string --match_string="__PUBLICPATH__" --replace_string="$public_pat # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$final_path/.env" -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -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" - #================================================= # INSTALL AND INITIALIZE COMPOSER #================================================= @@ -173,9 +173,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path - php$phpversion artisan migrate --no-interaction - #php$phpversion artisan config:clear --no-interaction - #php$phpversion artisan config:cache --no-interaction + php$phpversion artisan key:generate --no-interaction --force + php$phpversion artisan migrate --no-interaction --force popd fi From 52f6b11ccbfc12e2b800dd89aa3685b6492fe8d0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 15:34:11 +0100 Subject: [PATCH 42/78] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 5f2b821..840c38c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= From fcedd07a085b76fc8e0d02ef312fdf77e7717ed3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 20 Feb 2021 18:56:12 +0100 Subject: [PATCH 43/78] Update remove --- scripts/remove | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index a49c11b..4a66c7f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,9 +32,6 @@ ynh_script_progression --message="Removing Lychee main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" -# Remove data directory securely -ynh_secure_remove --file="$public_path" - #================================================= # REMOVE THE MYSQL DATABASE #================================================= From 0db8162253326964cbc2a678a4920afd5dca7d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Feb 2021 19:04:24 +0100 Subject: [PATCH 44/78] Upgrade to 4.2.2 (#16) * Upgrade to 4.2.2 --- README.md | 2 +- README_fr.md | 2 +- check_process | 5 +++-- conf/.env.example | 4 ++-- conf/app.src | 4 ++-- manifest.json | 4 ++-- pull_request_template.md | 4 +--- scripts/install | 7 +------ scripts/upgrade | 17 ++++++++++------- 9 files changed, 23 insertions(+), 26 deletions(-) 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" From bf3647d3cdd96a31ba791027b1f40b00636a1740 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Mar 2021 23:05:39 +0100 Subject: [PATCH 45/78] Remove is_public --- manifest.json | 2 +- scripts/upgrade | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/manifest.json b/manifest.json index f7a8ebd..f48b94f 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">> 4.0.0" + "yunohost": ">> 4.1.7" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index 76fbf5a..c4d1f03 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) @@ -37,15 +36,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) From 96bab659cba549a75e75b238b8662f5902152567 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 4 Apr 2021 17:14:49 +0200 Subject: [PATCH 46/78] Fix --- README.md | 4 ++-- README_fr.md | 4 ++-- manifest.json | 16 ++-------------- scripts/install | 1 - scripts/upgrade | 1 - 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 64945c6..ab68626 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ How to configure this app: From an admin panel. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/lychee%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/lychee%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/lychee/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/lychee.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/lychee.svg)](https://ci-apps-arm.yunohost.org/ci/apps/lychee/) ## Limitations diff --git a/README_fr.md b/README_fr.md index ba1b7a5..4d7a70f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -39,8 +39,8 @@ Comment configurer cette application : via le panneau d'administration. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/lychee%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/lychee%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/lychee/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/lychee.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/lychee.svg)](https://ci-apps-arm.yunohost.org/ci/apps/lychee/) ## Limitations diff --git a/manifest.json b/manifest.json index f48b94f..5a8df68 100644 --- a/manifest.json +++ b/manifest.json @@ -25,31 +25,19 @@ "arguments": { "install" : [ { - "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain name for Lychee", - "fr": "Choisissez un nom de domaine pour Lychee" - }, + "name": "domain", + "type": "domain", "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Lychee", - "fr": "Choisissez un chemin pour Lychee" - }, "example": "/lychee", "default": "/lychee" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "help": { "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.", "fr": "Si cette case est cochée, Lychee sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." diff --git a/scripts/install b/scripts/install index 56a6529..11be1bc 100755 --- a/scripts/install +++ b/scripts/install @@ -46,7 +46,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index c4d1f03..3cbce3b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 - # Create a temporary directory tmpdir="$(mktemp -d)" From d64fcb988456a46bed28dc4159c7420d6bea5805 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 4 Apr 2021 17:17:59 +0200 Subject: [PATCH 47/78] Update install --- scripts/install | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 11be1bc..6b9fda2 100755 --- a/scripts/install +++ b/scripts/install @@ -33,8 +33,8 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -public_path=/home/yunohost.app/$app -test ! -e "${public_path}" || ynh_die --message="${public_path} already exists" +# public_path=/home/yunohost.app/$app +# test ! -e "${public_path}" || ynh_die --message="${public_path} already exists" # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -77,9 +77,16 @@ ynh_setup_source --dest_dir=$final_path # CREATE DIRECTORIES #================================================= +public_path=/home/yunohost.app/$app ynh_app_setting_set --app=$app --key=public_path --value=$public_path -mkdir -p ${public_path}/uploads -mkdir -p ${public_path}/uploads/{big,import,medium,raw,small,thumb} + +mkdir -p $public_path/uploads +mkdir -p $public_path/uploads/{big,import,medium,raw,small,thumb} + +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config "public_path" @@ -142,7 +149,7 @@ ynh_store_file_checksum "$final_path/.env" # Set permissions to app files chown -R $app: $final_path chown -R $app: $public_path -chmod -R 755 ${public_path} +chmod -R 755 $public_path #================================================= # SETUP SSOWAT From 4e788edaa85a788a1adc971c3f847118bac81f04 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 4 Apr 2021 17:19:44 +0200 Subject: [PATCH 48/78] Update upgrade --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 3cbce3b..c749ec2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,11 +51,13 @@ fi # If public_path doesn't exist, create it if [ -z "$public_path" ]; then public_path=/home/yunohost.app/$app + mkdir -p $public_path ynh_app_setting_set --app=$app --key=public_path --value=$public_path fi if [ ! -d "$public_path/uploads" ]; then mkdir -p $public_path/uploads + mkdir -p $public_path/uploads/{big,import,medium,raw,small,thumb} fi # Cleaning legacy permissions From 30d4abd42fb3ee54251f2fc25000f6afab727de7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 00:01:19 +0200 Subject: [PATCH 49/78] Fix --- scripts/upgrade | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c749ec2..88d88c4 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,6 +144,9 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 + +ynh_secure_remove --file="$final_path/composer.lock" + # Upgrade composer itself ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" @@ -152,16 +155,11 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar #================================================= ynh_script_progression --message="Building..." -ynh_backup_if_checksum_is_different --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" - # Setup custom user.css file -cp ../conf/user.css.example $final_path/public/dist/user.css +#cp ../conf/user.css.example $final_path/public/dist/user.css #================================================= # INSTALL AND INITIALIZE COMPOSER From 5d1632b381182fc8cf3b91b28577e8ef35d85302 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 12:28:33 +0200 Subject: [PATCH 50/78] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 88d88c4..3ee2b25 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,8 +144,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 - -ynh_secure_remove --file="$final_path/composer.lock" +#ynh_secure_remove --file="$final_path/composer.lock" # Upgrade composer itself ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" @@ -169,6 +168,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path + composer install --no-dev php$phpversion artisan key:generate --no-interaction --force php$phpversion artisan migrate --no-interaction --force popd From 31e4362d47b9dbb9fa46bd5a3cf8c58558693a51 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 18:17:25 +0200 Subject: [PATCH 51/78] Fix boostrap/cach permissions --- scripts/install | 3 ++- scripts/restore | 3 ++- scripts/upgrade | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 6b9fda2..093f0d1 100755 --- a/scripts/install +++ b/scripts/install @@ -148,8 +148,9 @@ ynh_store_file_checksum "$final_path/.env" # Set permissions to app files chown -R $app: $final_path +chmod -R 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod -R 755 $public_path +chmod -R 750 $public_path #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 9cabb9a..a8f46fd 100755 --- a/scripts/restore +++ b/scripts/restore @@ -75,8 +75,9 @@ ynh_restore_file --origin_path="$public_path" --not_mandatory # RESTORE USER RIGHTS #================================================= -# Restore permissions on app files +# Set permissions to app files chown -R $app: $final_path +chmod -R 750 $final_path/bootstrap/cache chown -R $app: $public_path chmod -R 750 $public_path diff --git a/scripts/upgrade b/scripts/upgrade index 3ee2b25..dffcfa0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,9 +178,10 @@ fi # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions on app files +# Set permissions to app files chown -R $app: $final_path -#chown -R $app: $public_path +chmod -R 750 $final_path/bootstrap/cache +chown -R $app: $public_path chmod -R 750 $public_path #================================================= From ecab8cf83f7bb1aa689ca8ac86b3a8ee0f18e537 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 17 Apr 2021 17:57:01 +0200 Subject: [PATCH 52/78] Remove recursion on chmod --- README.md | 2 +- README_fr.md | 2 +- scripts/install | 7 ++----- scripts/upgrade | 7 ++----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ab68626..27fe87e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ How to configure this app: From an admin panel. ## Documentation * Official documentation: https://lycheeorg.github.io/docs/ - * YunoHost documentation: https://yunohost.org/#/app_lychee + * YunoHost documentation: https://yunohost.org/en/app_lychee ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 4d7a70f..375a413 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Comment configurer cette application : via le panneau d'administration. ## Documentation * Documentation officielle : https://lycheeorg.github.io/docs/ - * Documentation YunoHost : https://yunohost.org/#/app_lychee_fr + * Documentation YunoHost : https://yunohost.org/fr/app_lychee ## Caractéristiques spécifiques YunoHost diff --git a/scripts/install b/scripts/install index 093f0d1..df9f4dd 100755 --- a/scripts/install +++ b/scripts/install @@ -33,9 +33,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -# public_path=/home/yunohost.app/$app -# test ! -e "${public_path}" || ynh_die --message="${public_path} already exists" - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -148,9 +145,9 @@ ynh_store_file_checksum "$final_path/.env" # Set permissions to app files chown -R $app: $final_path -chmod -R 750 $final_path/bootstrap/cache +chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod -R 750 $public_path +chmod 750 $public_path #================================================= # SETUP SSOWAT diff --git a/scripts/upgrade b/scripts/upgrade index dffcfa0..4df9aff 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -157,9 +157,6 @@ ynh_script_progression --message="Building..." # Setup application config ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" -# Setup custom user.css file -#cp ../conf/user.css.example $final_path/public/dist/user.css - #================================================= # INSTALL AND INITIALIZE COMPOSER #================================================= @@ -180,9 +177,9 @@ fi # Set permissions to app files chown -R $app: $final_path -chmod -R 750 $final_path/bootstrap/cache +chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod -R 750 $public_path +chmod 750 $public_path #================================================= # RELOAD NGINX From 652c1da559db639c32efbdf3805ca94f6f3434f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Apr 2021 09:59:07 +0200 Subject: [PATCH 53/78] 4.3 (#22) * upgrade to 4.3 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 28 ++++++++++------------------ scripts/restore | 4 ++-- scripts/upgrade | 9 ++++++--- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 27fe87e..83ec260 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.2 +**Shipped version:** 4.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 375a413..3ec9d46 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.2 +**Version incluse :** 4.3 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 62993e9..7c85370 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.2.2/Lychee.zip -SOURCE_SUM=9d570abb980d8ad5529eaab235a8dd71586a805e48f532357a390384bab0c38b +SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.3.0/Lychee.zip +SOURCE_SUM=4d9afdafb3d6711e85779377ebde523d7ef0a5bf3aea6ff7ca29ef6058536184 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5a8df68..d4f0f39 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.2~ynh1", + "version": "4.3~ynh1", "url": "https://lycheeorg.github.io/", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index df9f4dd..2680a41 100755 --- a/scripts/install +++ b/scripts/install @@ -61,6 +61,14 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=2 + +# Create a system user +ynh_system_user_create --username=$app + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -88,14 +96,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config "public_path" -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -110,8 +110,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 -# Install composer -ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" +ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # BUILDING @@ -132,13 +131,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 #================================================= @@ -147,7 +139,7 @@ ynh_store_file_checksum "$final_path/.env" chown -R $app: $final_path chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod 750 $public_path +chmod 755 $public_path #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index a8f46fd..a086dc1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,9 +77,9 @@ ynh_restore_file --origin_path="$public_path" --not_mandatory # Set permissions to app files chown -R $app: $final_path -chmod -R 750 $final_path/bootstrap/cache +chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod -R 750 $public_path +chmod 755 $public_path #================================================= # REINSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index 4df9aff..b8e5cea 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,6 +95,9 @@ then # Backup the config file in the temp dir cp -a "$final_path/public/dist/user.css" "$tmpdir/user.css" + # Move media to new path + cp -a "$final_path/public/uploads" "$public_path/uploads" + # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -147,7 +150,8 @@ ynh_script_progression --message="Installing Composer..." --weight=1 #ynh_secure_remove --file="$final_path/composer.lock" # 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" +ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # SETUP APPLICATION CONFIG @@ -165,7 +169,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path - composer install --no-dev php$phpversion artisan key:generate --no-interaction --force php$phpversion artisan migrate --no-interaction --force popd @@ -179,7 +182,7 @@ fi chown -R $app: $final_path chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path -chmod 750 $public_path +chmod 755 $public_path #================================================= # RELOAD NGINX From a7735612aaa9700578c18950661047bd6ee4b508 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 19 Apr 2021 16:11:51 +0200 Subject: [PATCH 54/78] Update upgrade --- scripts/upgrade | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index b8e5cea..bd61f5e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,11 +55,6 @@ if [ -z "$public_path" ]; then ynh_app_setting_set --app=$app --key=public_path --value=$public_path fi -if [ ! -d "$public_path/uploads" ]; then - mkdir -p $public_path/uploads - mkdir -p $public_path/uploads/{big,import,medium,raw,small,thumb} -fi - # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -95,6 +90,11 @@ then # Backup the config file in the temp dir cp -a "$final_path/public/dist/user.css" "$tmpdir/user.css" + if [ "$version" -lt "4.3" ]; then + mkdir -p $public_path/uploads + cp -a "$final_path/public/uploads" "$public_path/uploads" + fi + # Move media to new path cp -a "$final_path/public/uploads" "$public_path/uploads" @@ -147,16 +147,12 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 -#ynh_secure_remove --file="$final_path/composer.lock" - -# Upgrade composer itself -#ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev" -ynh_install_composer --install_args="--ignore-platform-reqs" +ynh_install_composer --workdir="$final_path" --install_args="--ignore-platform-reqs" #================================================= # SETUP APPLICATION CONFIG #================================================= -ynh_script_progression --message="Building..." +ynh_script_progression --message="Setip Lychee config..." # Setup application config ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" From 3c570d6b448c58fed5b654fc9af91ed25f49b5cd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 19 Apr 2021 18:36:03 +0200 Subject: [PATCH 55/78] Update upgrade --- scripts/upgrade | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index bd61f5e..e5ae2e0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,12 +92,10 @@ then if [ "$version" -lt "4.3" ]; then mkdir -p $public_path/uploads + # Move media to new path cp -a "$final_path/public/uploads" "$public_path/uploads" fi - # Move media to new path - cp -a "$final_path/public/uploads" "$public_path/uploads" - # Remove the app directory securely ynh_secure_remove --file="$final_path" From 54b9fd0b9df83b3c865bd5411e51a83e4880228f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 19 Apr 2021 19:12:51 +0200 Subject: [PATCH 56/78] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index e5ae2e0..3fdf7a3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,6 +23,7 @@ public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +version=ynh_app_upstream_version #================================================= # CHECK VERSION From ab892c9cc745f47bcd3c4b46d9770eef9f1f6a6f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 20 Apr 2021 20:06:49 +0200 Subject: [PATCH 57/78] Fix --- scripts/_common.sh | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 54ab511..90f8f7b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= YNH_PHP_VERSION=7.4 - +YNH_COMPOSER_VERSION=2.0.8 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" # needed for raw upload and video playback @@ -15,7 +15,7 @@ pkg_dependencies="ufraw-batch ffmpeg" # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.8 +readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 # Declare the actual composer version to use. # A packager willing to use another version of composer can override the variable into its _common.sh. YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} diff --git a/scripts/upgrade b/scripts/upgrade index 3fdf7a3..e42da95 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -151,7 +151,7 @@ ynh_install_composer --workdir="$final_path" --install_args="--ignore-platform-r #================================================= # SETUP APPLICATION CONFIG #================================================= -ynh_script_progression --message="Setip Lychee config..." +ynh_script_progression --message="Setting Lychee config..." # Setup application config ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" From 27f6bd8cf5cc2bcc0217299be8fca689b33b7dfc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 8 May 2021 19:10:33 +0200 Subject: [PATCH 58/78] Upgrade requirements --- manifest.json | 2 +- scripts/_common.sh | 108 ++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/manifest.json b/manifest.json index d4f0f39..08ede24 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">> 4.1.7" + "yunohost": ">> 4.2.4" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 90f8f7b..48045d0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,62 +15,62 @@ pkg_dependencies="ufraw-batch ffmpeg" # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 -# Declare the actual composer version to use. -# A packager willing to use another version of composer can override the variable into its _common.sh. -YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} +# readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 +# # Declare the actual composer version to use. +# # A packager willing to use another version of composer can override the variable into its _common.sh. +# YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} -# Execute a command with Composer -# -# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" -# | arg: -v, --phpversion - PHP version to use with composer -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# | arg: -c, --commands - Commands to execute. -ynh_composer_exec () { - # Declare an array to define the options of this helper. - local legacy_args=vwc - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) - local phpversion - local workdir - local commands - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-$YNH_PHP_VERSION}" +# # Execute a command with Composer +# # +# # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" +# # | arg: -v, --phpversion - PHP version to use with composer +# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. +# # | arg: -c, --commands - Commands to execute. +# ynh_composer_exec () { +# # Declare an array to define the options of this helper. +# local legacy_args=vwc +# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) +# local phpversion +# local workdir +# local commands +# # Manage arguments with getopts +# ynh_handle_getopts_args "$@" +# workdir="${workdir:-$final_path}" +# phpversion="${phpversion:-$YNH_PHP_VERSION}" - COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} "$workdir/composer.phar" $commands \ - -d "$workdir" --quiet --no-interaction -} +# COMPOSER_HOME="$workdir/.composer" \ +# php${phpversion} "$workdir/composer.phar" $commands \ +# -d "$workdir" --quiet --no-interaction +# } -# Install and initialize Composer in the given directory -# -# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] -# | arg: -v, --phpversion - PHP version to use with composer -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include -# | arg: -c, --composerversion - Composer version to install -ynh_install_composer () { - # Declare an array to define the options of this helper. - local legacy_args=vwa - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) - local phpversion - local workdir - local install_args - local composerversion - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-$YNH_PHP_VERSION}" - install_args="${install_args:-}" - composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" +# # Install and initialize Composer in the given directory +# # +# # usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] +# # | arg: -v, --phpversion - PHP version to use with composer +# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. +# # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include +# # | arg: -c, --composerversion - Composer version to install +# ynh_install_composer () { +# # Declare an array to define the options of this helper. +# local legacy_args=vwa +# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) +# local phpversion +# local workdir +# local install_args +# local composerversion +# # Manage arguments with getopts +# ynh_handle_getopts_args "$@" +# workdir="${workdir:-$final_path}" +# phpversion="${phpversion:-$YNH_PHP_VERSION}" +# install_args="${install_args:-}" +# composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" - curl -sS https://getcomposer.org/installer 2>&1 \ - | COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ - || ynh_die "Unable to install Composer." 2>&1 +# curl -sS https://getcomposer.org/installer 2>&1 \ +# | COMPOSER_HOME="$workdir/.composer" \ +# php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ +# || ynh_die "Unable to install Composer." 2>&1 - # update dependencies to create composer.lock - ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ - || ynh_die "Unable to update core dependencies with Composer." -} +# # update dependencies to create composer.lock +# ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ +# || ynh_die "Unable to update core dependencies with Composer." +# } From 5ad6429800dbfe18782804d7ac9020f790c05f26 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 15 May 2021 13:15:33 +0200 Subject: [PATCH 59/78] Fix --- check_process | 6 +++--- scripts/upgrade | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 5d9cb97..55c2ed8 100644 --- a/check_process +++ b/check_process @@ -5,9 +5,9 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/scripts/upgrade b/scripts/upgrade index e42da95..e4aa069 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,12 +85,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 - # Create a temporary directory - tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - cp -a "$final_path/public/dist/user.css" "$tmpdir/user.css" - if [ "$version" -lt "4.3" ]; then mkdir -p $public_path/uploads # Move media to new path @@ -101,13 +95,7 @@ then ynh_secure_remove --file="$final_path" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" - - # Copy the admin saved settings from tmp directory to final path - cp -a "$tmpdir/user.css" "$final_path/public/dist/user.css" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css" fi #================================================= From f97b72a21a7292eaba11803d1a4e414bce5c1e8d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 14:15:30 +0200 Subject: [PATCH 60/78] Fix --- scripts/_common.sh | 68 ++++++---------------------------------------- scripts/backup | 5 ++++ scripts/install | 10 +++++-- scripts/upgrade | 34 ++++++++++------------- 4 files changed, 35 insertions(+), 82 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 48045d0..6e38880 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,72 +5,20 @@ #================================================= YNH_PHP_VERSION=7.4 -YNH_COMPOSER_VERSION=2.0.8 +YNH_COMPOSER_VERSION=2.0.13 extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" # needed for raw upload and video playback pkg_dependencies="ufraw-batch ffmpeg" +#================================================= +# PERSONAL HELPERS +#================================================= + #================================================= # EXPERIMENTAL HELPERS #================================================= -# readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 -# # Declare the actual composer version to use. -# # A packager willing to use another version of composer can override the variable into its _common.sh. -# YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} - -# # Execute a command with Composer -# # -# # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" -# # | arg: -v, --phpversion - PHP version to use with composer -# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# # | arg: -c, --commands - Commands to execute. -# ynh_composer_exec () { -# # Declare an array to define the options of this helper. -# local legacy_args=vwc -# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) -# local phpversion -# local workdir -# local commands -# # Manage arguments with getopts -# ynh_handle_getopts_args "$@" -# workdir="${workdir:-$final_path}" -# phpversion="${phpversion:-$YNH_PHP_VERSION}" - -# COMPOSER_HOME="$workdir/.composer" \ -# php${phpversion} "$workdir/composer.phar" $commands \ -# -d "$workdir" --quiet --no-interaction -# } - -# # Install and initialize Composer in the given directory -# # -# # usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] -# # | arg: -v, --phpversion - PHP version to use with composer -# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include -# # | arg: -c, --composerversion - Composer version to install -# ynh_install_composer () { -# # Declare an array to define the options of this helper. -# local legacy_args=vwa -# declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) -# local phpversion -# local workdir -# local install_args -# local composerversion -# # Manage arguments with getopts -# ynh_handle_getopts_args "$@" -# workdir="${workdir:-$final_path}" -# phpversion="${phpversion:-$YNH_PHP_VERSION}" -# install_args="${install_args:-}" -# composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" - -# curl -sS https://getcomposer.org/installer 2>&1 \ -# | COMPOSER_HOME="$workdir/.composer" \ -# php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ -# || ynh_die "Unable to install Composer." 2>&1 - -# # update dependencies to create composer.lock -# ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ -# || ynh_die "Unable to update core dependencies with Composer." -# } +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index e5ee3e8..7645bce 100755 --- a/scripts/backup +++ b/scripts/backup @@ -29,6 +29,11 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= diff --git a/scripts/install b/scripts/install index 2680a41..4beb733 100755 --- a/scripts/install +++ b/scripts/install @@ -129,15 +129,19 @@ pushd $final_path popd # Setup custom user.css file -cp ../conf/user.css.example $final_path/public/dist/user.css +ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css" #================================================= # SECURE FILES AND DIRECTORIES #================================================= # Set permissions to app files -chown -R $app: $final_path -chmod 750 $final_path/bootstrap/cache + +chmod 750 "$final_path" +chmod 750 "$final_path/bootstrap/cache" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + chown -R $app: $public_path chmod 755 $public_path diff --git a/scripts/upgrade b/scripts/upgrade index e4aa069..0310bbf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,7 +28,6 @@ version=ynh_app_upstream_version #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) @@ -77,6 +76,14 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -91,11 +98,8 @@ then cp -a "$final_path/public/uploads" "$public_path/uploads" fi - # Remove the app directory securely - ynh_secure_remove --file="$final_path" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css $final_path/.env" fi #================================================= @@ -113,14 +117,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=6 ynh_install_app_dependencies $pkg_dependencies -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -134,15 +130,15 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 -ynh_install_composer --workdir="$final_path" --install_args="--ignore-platform-reqs" +ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # SETUP APPLICATION CONFIG #================================================= -ynh_script_progression --message="Setting Lychee config..." +# ynh_script_progression --message="Setting Lychee config..." -# Setup application config -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +# # Setup application config +# ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" #================================================= # INSTALL AND INITIALIZE COMPOSER @@ -152,8 +148,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path - php$phpversion artisan key:generate --no-interaction --force - php$phpversion artisan migrate --no-interaction --force + php$phpversion artisan key:generate -n --force + php$phpversion artisan migrate -n --force popd fi From 7bbab29a9c1f1d36562a86b4e3a45600d5a78abf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 14:16:09 +0200 Subject: [PATCH 61/78] Update upgrade --- scripts/upgrade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0310bbf..c32b309 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,6 +102,10 @@ then ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css $final_path/.env" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -157,9 +161,6 @@ fi # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files -chown -R $app: $final_path -chmod 750 $final_path/bootstrap/cache chown -R $app: $public_path chmod 755 $public_path From b5546bd2afc21f3f6fe9eaf4543bb2b62f6d8731 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 14:21:26 +0200 Subject: [PATCH 62/78] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 08ede24..9ce297d 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">> 4.2.4" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ From 4164c2a0be87850d493be98d56658ec0451a6035 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 14:40:08 +0200 Subject: [PATCH 63/78] Add templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ 2 files changed, 71 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) From 02c7dd53f072005e2e790173c73d4c05213227fd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:08:16 +0200 Subject: [PATCH 64/78] Update restore --- scripts/restore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index a086dc1..30bd6b5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -76,8 +76,11 @@ ynh_restore_file --origin_path="$public_path" --not_mandatory #================================================= # Set permissions to app files -chown -R $app: $final_path -chmod 750 $final_path/bootstrap/cache +chmod 750 "$final_path" +chmod 750 "$final_path/bootstrap/cache" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + chown -R $app: $public_path chmod 755 $public_path From d4d0f6456521fb049dadd704ab35da918cac1662 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:31:20 +0200 Subject: [PATCH 65/78] Fix --- scripts/_common.sh | 6 ++++-- scripts/change_url | 1 + scripts/upgrade | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6e38880..030828b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,10 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=7.4 -YNH_COMPOSER_VERSION=2.0.13 +YNH_PHP_VERSION="7.4" + +YNH_COMPOSER_VERSION="2.0.13" + extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" # needed for raw upload and video playback diff --git a/scripts/change_url b/scripts/change_url index 96fc140..d88a31b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,6 +31,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +public_path=$(ynh_app_setting_get --app=$app --key=public_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP diff --git a/scripts/upgrade b/scripts/upgrade index c32b309..2505923 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 -ynh_install_composer --install_args="--ignore-platform-reqs" +ynh_install_composer #--install_args="--ignore-platform-reqs" #================================================= # SETUP APPLICATION CONFIG From 35120189ace064db331ed3d6151f7d8a6f0fe86f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:31:53 +0200 Subject: [PATCH 66/78] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 4beb733..7cf6249 100755 --- a/scripts/install +++ b/scripts/install @@ -94,7 +94,7 @@ mkdir -p $public_path/uploads/{big,import,medium,raw,small,thumb} ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config -ynh_add_nginx_config "public_path" +ynh_add_nginx_config #"public_path" #================================================= # PHP-FPM CONFIGURATION @@ -110,7 +110,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 -ynh_install_composer --install_args="--ignore-platform-reqs" +ynh_install_composer #--install_args="--ignore-platform-reqs" #================================================= # BUILDING From e209e67e4964d97bf86f88e886fbcf44471cf91d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:43:54 +0200 Subject: [PATCH 67/78] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 030828b..f338aba 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.4" -YNH_COMPOSER_VERSION="2.0.13" +YNH_COMPOSER_VERSION="2.0.0" extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From 6cb56ab8be7dfe26e036e2c94e103acf851455b4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:44:21 +0200 Subject: [PATCH 68/78] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f338aba..492ecab 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.4" -YNH_COMPOSER_VERSION="2.0.0" +# YNH_COMPOSER_VERSION="2.0.0" extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From 5081819b98db44b283717ea4a339bd4fd1b359e5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 15:51:59 +0200 Subject: [PATCH 69/78] Fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 7cf6249..48fd622 100755 --- a/scripts/install +++ b/scripts/install @@ -110,7 +110,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Installing Lychee with Composer..." --weight=15 -ynh_install_composer #--install_args="--ignore-platform-reqs" +ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # BUILDING diff --git a/scripts/upgrade b/scripts/upgrade index 2505923..c32b309 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= ynh_script_progression --message="Installing Composer..." --weight=1 -ynh_install_composer #--install_args="--ignore-platform-reqs" +ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # SETUP APPLICATION CONFIG From 5c372f89af18613f095cf70d8314d53f10a0e521 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 18:10:59 +0200 Subject: [PATCH 70/78] Update upgrade --- scripts/upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c32b309..784ef3a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ then fi # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css $final_path/.env" + ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/public/dist/user.css $final_path/.env" fi chmod 750 "$final_path" @@ -141,8 +141,8 @@ ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # ynh_script_progression --message="Setting Lychee config..." -# # Setup application config -# ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +# Setup application config +ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" #================================================= # INSTALL AND INITIALIZE COMPOSER @@ -152,8 +152,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path - php$phpversion artisan key:generate -n --force - php$phpversion artisan migrate -n --force + #php$phpversion artisan key:generate -n --force + php$phpversion artisan migrate -n #--force popd fi From b2d8f0472a546f9399b1ec4e9255800a534f8832 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 18:12:38 +0200 Subject: [PATCH 71/78] Update upgrade --- scripts/upgrade | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 784ef3a..033fa1f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,6 +53,7 @@ if [ -z "$public_path" ]; then public_path=/home/yunohost.app/$app mkdir -p $public_path ynh_app_setting_set --app=$app --key=public_path --value=$public_path + cp -a "$final_path/public/uploads" "$public_path/uploads" fi # Cleaning legacy permissions @@ -92,12 +93,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 - if [ "$version" -lt "4.3" ]; then - mkdir -p $public_path/uploads - # Move media to new path - cp -a "$final_path/public/uploads" "$public_path/uploads" - fi - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/public/dist/user.css $final_path/.env" fi From 2f31a29b03d032e7218a2b10f020475822733eef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 19:20:06 +0200 Subject: [PATCH 72/78] Update upgrade --- scripts/upgrade | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 033fa1f..16dfe40 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,7 +94,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/public/dist/user.css $final_path/.env" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css $final_path/.env" fi chmod 750 "$final_path" @@ -137,20 +137,17 @@ ynh_install_composer --install_args="--ignore-platform-reqs" # ynh_script_progression --message="Setting Lychee config..." # Setup application config -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +#ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" #================================================= # INSTALL AND INITIALIZE COMPOSER #================================================= +ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 - pushd $final_path - #php$phpversion artisan key:generate -n --force - php$phpversion artisan migrate -n #--force - popd -fi +pushd $final_path + #php$phpversion artisan key:generate -n --force + php$phpversion artisan migrate -n #--force +popd #================================================= # SECURE FILES AND DIRECTORIES From a2d8e8712d5cd230469a124213f88bb2670175cf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 20:40:28 +0200 Subject: [PATCH 73/78] Update upgrade --- scripts/upgrade | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 16dfe40..7b5ec92 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,8 +145,10 @@ ynh_install_composer --install_args="--ignore-platform-reqs" ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 pushd $final_path - #php$phpversion artisan key:generate -n --force - php$phpversion artisan migrate -n #--force + php$phpversion artisan key:generate -n --force --env + php$phpversion artisan migrate -n --force + php$phpversion artisan config:clear -n + php$phpversion artisan config:cache -n popd #================================================= From 8e023f1fecb1d57892a264e5591c5a6217037ac6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 22:42:48 +0200 Subject: [PATCH 74/78] Update upgrade --- scripts/upgrade | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7b5ec92..81ea78a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,12 +144,18 @@ ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= ynh_script_progression --message="Upgrading Lychee source files..." --weight=4 -pushd $final_path - php$phpversion artisan key:generate -n --force --env - php$phpversion artisan migrate -n --force - php$phpversion artisan config:clear -n - php$phpversion artisan config:cache -n -popd +# pushd $final_path +# php$phpversion artisan key:generate -n --force --env +# php$phpversion artisan migrate -n --force +# php$phpversion artisan config:clear -n +# php$phpversion artisan config:cache -n +# popd + +ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" + +( cd $final_path && php$phpversion artisan migrate -n --force ) +( cd $final_path && php$phpversion artisan config:clear -n ) +( cd $final_path && php$phpversion artisan config:cache -n ) #================================================= # SECURE FILES AND DIRECTORIES From 9c45150cf8859e2f24ce2f0f45237f221746d69d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Jun 2021 23:14:38 +0200 Subject: [PATCH 75/78] Update check_process --- check_process | 6 ------ 1 file changed, 6 deletions(-) diff --git a/check_process b/check_process index 55c2ed8..7614fc0 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,3 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" @@ -19,7 +14,6 @@ upgrade=1 from_commit=2a2fd5b9a9e81ff8e157cf1747418fd11f4211a2 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= From 2a65ebf25395b79a42efc4a95fa8cdb63da7383f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Jun 2021 18:52:57 +0200 Subject: [PATCH 76/78] Update _common.sh --- scripts/_common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 492ecab..02a192e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,8 @@ YNH_PHP_VERSION="7.4" -# YNH_COMPOSER_VERSION="2.0.0" +# Composer version +YNH_COMPOSER_VERSION="2.0.13" extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip" From f7b9d8ccfa26f2242813c5e4171060ca3043b2ae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Jun 2021 23:46:59 +0200 Subject: [PATCH 77/78] remove template --- issue_template.md | 55 ---------------------------------------- pull_request_template.md | 16 ------------ 2 files changed, 71 deletions(-) delete mode 100644 issue_template.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 7e9710a..0000000 --- a/issue_template.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -name: Bug report -about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. - ---- - -**How to post a meaningful bug report** -1. *Read this whole template first.* -2. *Make sure you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - - *In doubt, ask here and we will figure it out together.* -3. *Delete these italic comments as you write over them below, and remove this guide.* ---- - -### Describe the bug - -*A clear and concise description of what the bug is.* - -### Context - -- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* -- YunoHost version: x.x.x -- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - - If yes, please explain: -- Using, or trying to install package version/branch: -- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* - -### Steps to reproduce - -- *If you performed a command from the CLI, the command itself is enough. For example:* - ```sh - sudo yunohost app install lychee - ``` -- *If you used the webadmin, please perform the equivalent command from the CLI first.* -- *If the error occurs in your browser, explain what you did:* - 1. *Go to '...'* - 2. *Click on '...'* - 3. *Scroll down to '...'* - 4. *See error* - -### Expected behavior - -*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* - -### Logs - -*When an operation fails, YunoHost provides a simple way to share the logs.* -- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* -- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* - -*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* - -*If applicable and useful, add screenshots to help explain your problem.* diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* 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!"* From 3f1325345f12cb64deeed54d60cb9541ec16287a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 11 Jun 2021 23:42:00 +0200 Subject: [PATCH 78/78] Fix upgrade (#26) * Backup before any upgrade step * Use $YNH_PHP_VERSION, not the maybe old one, in upgrade --- scripts/upgrade | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 81ea78a..8651aae 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION version=ynh_app_upstream_version #================================================= @@ -31,6 +31,20 @@ version=ynh_app_upstream_version upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up Lychee before upgrading..." --weight=3 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -63,20 +77,6 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up Lychee before upgrading..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # CREATE DEDICATED USER #=================================================