From dafcb04f7bf2afdc6d40edb60ee975f2cade18fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Sep 2023 23:53:43 +0200 Subject: [PATCH 1/9] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f21374d..d48c582 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,19 +21,19 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint fi # If fpm_free_footprint doesn't exist, create it -if [ -z "$fpm_free_footprint" ]; then +if [ -z "${fpm_free_footprint:-}" ]; then fpm_free_footprint=0 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint fi # If fpm_usage doesn't exist, create it -if [ -z "$fpm_usage" ]; then +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi From 82b6db9da0accb96689fb75885982271fbe986f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Sep 2023 23:54:24 +0200 Subject: [PATCH 2/9] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d48c582..05adff2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,7 +60,7 @@ chmod g+w $install_dir/data/cache $install_dir/data/favicons $install_dir/data/l ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config From d3abad7a26ddb55d97e42213dcd5afa6de16ba0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Sep 2023 23:55:29 +0200 Subject: [PATCH 3/9] Delete check_process --- check_process | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index a94739b..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #upgrade=1 from_commit=CommitHash - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& From 3443e3a519b44b1d8c5a0c285258e542c62cdb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 22:59:31 +0200 Subject: [PATCH 4/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 95e4fa8..74b0143 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,4 +52,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "sqlite3, php8.2-xml, php8.2-sqlite3, php8.2-mbstring, php8.2-mysql, php8.2-gd, php8.2-curl" + packages = "sqlite3, php8.2-xml, php8.2-sqlite3, php8.2-mbstring, php8.2-gd, php8.2-curl" From 73cbf8e4c0edb9100bb609ca267034c42d060cab Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 Oct 2023 20:59:36 +0000 Subject: [PATCH 5/9] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 73a1445..91f0f58 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 37c42fc..1a03771 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,6 @@ Selfoss est un lecteur RSS polyvalent et une application Web d'agrégation de fl * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From dbc954464b7d89b644eb624f5a006b96ac1a93bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:10:20 +0200 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 74b0143..4b3e03b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Selfoss" description.en = "Multipurpose RSS reader" description.fr = "Lecteur RSS polyvalent" -version = "2.19~ynh2" +version = "2.19~ynh3" maintainers = ["eric_G"] From 37ea59c4d44569b71fc136ca2ae3d96e95c2ed00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 22:03:12 +0200 Subject: [PATCH 7/9] cleaning --- scripts/install | 4 ++-- scripts/upgrade | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index ec9b1a1..b1e49e2 100755 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.ini" --destination="$install_dir/config.ini" +ynh_add_config --template="config.ini" --destination="$install_dir/config.ini" chmod 400 "$install_dir/config.ini" chown $app:$app "$install_dir/config.ini" @@ -59,7 +59,7 @@ chown $app:$app "$install_dir/config.ini" #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 05adff2..ac9fa47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,11 +70,20 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.ini" --destination="$install_dir/config.ini" +ynh_add_config --template="config.ini" --destination="$install_dir/config.ini" chmod 400 "$install_dir/config.ini" chown $app:$app "$install_dir/config.ini" +#================================================= +# SETUP A CRON +#================================================= +ynh_script_progression --message="Setuping a cron..." --weight=1 + +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + #================================================= # END OF SCRIPT #================================================= From da5012990890fa7dc4ddaae7e45349cea9ac21da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 23:25:59 +0200 Subject: [PATCH 8/9] Update cron --- conf/cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index 35d705b..1b1d029 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >>/var/log/selfoss_update.log > /dev/null +*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >> __INSTALL_DIR__/data/logs/cliupdate.log > /dev/null From 567faa56b145a83f3225d383961761143acf7b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 23:26:34 +0200 Subject: [PATCH 9/9] Update cron --- conf/cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index 1b1d029..83e8f31 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >> __INSTALL_DIR__/data/logs/cliupdate.log > /dev/null +*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/cliupdate.php >> __INSTALL_DIR__/data/logs/cliupdate.log