From 5504f78544b10a911a515f0c620d3081b3ffe342 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 22 Jan 2023 11:24:00 +0000 Subject: [PATCH 1/2] Auto-update README --- README.md | 20 ++++++++++++-------- README_fr.md | 32 ++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index bd7e02e..96245f0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # COPS for YunoHost -[![Integration level](https://dash.yunohost.org/integration/cops.svg)](https://dash.yunohost.org/appci/app/cops) ![](https://ci-apps.yunohost.org/ci/badges/cops.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cops.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/cops.svg)](https://dash.yunohost.org/appci/app/cops) ![Working status](https://ci-apps.yunohost.org/ci/badges/cops.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cops.maintain.svg) [![Install COPS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cops) *[Lire ce readme en français.](./README_fr.md)* @@ -20,7 +20,6 @@ Calibre OPDS (and HTML) PHP Server **Shipped version:** 1.1.3~ynh1 **Demo:** http://cops-demo.slucas.fr/index.php - ## Disclaimers / important information You need to indicate the true path of your calibre library and make sure COPS runs under the same user as were the files are located @@ -29,22 +28,27 @@ Calibre OPDS (and HTML) PHP Server Creates an OPDS and HTML server based on a Calibre folder stored in NextCloud +## :red_circle: Antifeatures + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentation and resources -* Official app website: https://blog.slucas.fr/projects/calibre-opds-php-server/ -* Upstream app code repository: https://github.com/seblucas/cops -* YunoHost documentation for this app: https://yunohost.org/app_cops -* Report a bug: https://github.com/YunoHost-Apps/cops_ynh/issues +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cops_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/cops_ynh/tree/testing --debug or sudo yunohost app upgrade cops -u https://github.com/YunoHost-Apps/cops_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index bff1899..fb178ce 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,22 +1,25 @@ + + # COPS pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/cops.svg)](https://dash.yunohost.org/appci/app/cops) ![](https://ci-apps.yunohost.org/ci/badges/cops.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cops.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/cops.svg)](https://dash.yunohost.org/appci/app/cops) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cops.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cops.maintain.svg) [![Installer COPS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cops) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer COPS rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer COPS rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Calibre OPDS (et HTML) PHP Serveur **Version incluse :** 1.1.3~ynh1 **Démo :** http://cops-demo.slucas.fr/index.php - ## Avertissements / informations importantes You need to indicate the true path of your calibre library and make sure COPS runs under the same user as were the files are located @@ -25,22 +28,27 @@ Calibre OPDS (et HTML) PHP Serveur Creates an OPDS and HTML server based on a Calibre folder stored in NextCloud +## :red_circle: Fonctions indésirables + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentations et ressources -* Site officiel de l'app : https://blog.slucas.fr/projects/calibre-opds-php-server/ -* Dépôt de code officiel de l'app : https://github.com/seblucas/cops -* Documentation YunoHost pour cette app : https://yunohost.org/app_cops -* Signaler un bug : https://github.com/YunoHost-Apps/cops_ynh/issues +* Site officiel de l’app : +* Dépôt de code officiel de l’app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/cops_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/cops_ynh/tree/testing --debug ou sudo yunohost app upgrade cops -u https://github.com/YunoHost-Apps/cops_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 202b0bd3f95985b670b2cef7a55167079d5e3525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 22 Jan 2023 12:26:54 +0100 Subject: [PATCH 2/2] Fix --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 16 ++++++++-------- scripts/restore | 14 +++++++------- scripts/upgrade | 23 ++++++++--------------- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/manifest.json b/manifest.json index ef63047..891fc26 100644 --- a/manifest.json +++ b/manifest.json @@ -25,7 +25,7 @@ "php7.3-fpm" ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "arguments": { "install" : [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 978249f..0fc5c96 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" # dependencies used by the app pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl" diff --git a/scripts/install b/scripts/install index c53f842..da93500 100755 --- a/scripts/install +++ b/scripts/install @@ -77,14 +77,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -93,6 +85,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # CREATE DATA DIRECTORY #================================================= diff --git a/scripts/restore b/scripts/restore index 9136df8..40ffae1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,13 +39,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -88,6 +81,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # REINSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b3c3660..6cae4ac 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,13 +45,6 @@ ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 - -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -102,14 +95,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -125,6 +110,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # RESTORE THE DATA DIRECTORY #=================================================