diff --git a/README.md b/README.md index 3f6219f..469bc3f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Backdrop for YunoHost -[![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![Working status](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) [![Install Backdrop with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Lire ce readme en français.](./README_fr.md)* @@ -18,13 +18,14 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Backdrop is a full-featured content management system that allows non-technical users to manage a wide variety of content. It can be used to create all kinds of websites including blogs, image galleries, social networks, intranets, and more. -**Shipped version:** 1.22.0~ynh1 +**Shipped version:** 1.22.2~ynh1 + **Demo:** https://backdropcms.org/demo ## Screenshots -![](./doc/screenshots/Hello_world.png) +![Screenshot of Backdrop](./doc/screenshots/Hello_world.png) ## Disclaimers / important information @@ -35,21 +36,22 @@ Run `update.php` by navigating to `http://example.com/core/update.php` [See inst ## Documentation and resources -* Official app website: https://backdropcms.org/ -* Official user documentation: https://backdropcms.org/user-guide -* Upstream app code repository: https://github.com/backdrop/backdrop -* YunoHost documentation for this app: https://yunohost.org/app_backdrop -* Report a bug: https://github.com/YunoHost-Apps/backdrop_ynh/issues +* Official app website: +* Official user documentation: +* 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/backdrop_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/backdrop_ynh/tree/testing --debug or sudo yunohost app upgrade backdrop -u https://github.com/YunoHost-Apps/backdrop_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 6578729..beebc43 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Backdrop pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) [![Installer Backdrop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Backdrop 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.* @@ -14,13 +18,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Backdrop est un système de gestion de contenu complet qui permet aux utilisateurs non techniques de gérer une grande variété de contenu. Il peut être utilisé pour créer toutes sortes de sites Web, notamment des blogs, des galeries d'image, des réseaux sociaux, des intranets et plus encore. -**Version incluse :** 1.22.0~ynh1 +**Version incluse :** 1.22.2~ynh1 + **Démo :** https://backdropcms.org/demo ## Captures d'écran -![](./doc/screenshots/Hello_world.png) +![Capture d'écran de Backdrop](./doc/screenshots/Hello_world.png) ## Avertissements / informations importantes @@ -30,21 +35,22 @@ Backdrop CMS inclus un utilitaire de mise à jour pour gérer toutes les modific ## Documentations et ressources -* Site officiel de l'app : https://backdropcms.org/ -* Documentation officielle utilisateur : https://backdropcms.org/user-guide -* Dépôt de code officiel de l'app : https://github.com/backdrop/backdrop -* Documentation YunoHost pour cette app : https://yunohost.org/app_backdrop -* Signaler un bug : https://github.com/YunoHost-Apps/backdrop_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* 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/backdrop_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/backdrop_ynh/tree/testing --debug ou sudo yunohost app upgrade backdrop -u https://github.com/YunoHost-Apps/backdrop_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 :** diff --git a/conf/app.src b/conf/app.src index 1635f28..27d9b28 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.22.0/backdrop.zip -SOURCE_SUM=1c829ed12f3d2ca6a6e5991fc701af13fba7fed9f6bd0b11ee8c1b08357ccd57 +SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.22.2/backdrop.zip +SOURCE_SUM=ffec826e9b9ccbead7d2baeae3c6622cb6aeb09f6f33f9463e9a41ac257039a2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index dfc20ba..eb29e72 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,15 @@ "en": "Easy-to-use CMS for building professional websites", "fr": "CMS facile à utiliser pour créer des sites Web professionnels" }, - "version": "1.22.0~ynh1", + "version": "1.22.2~ynh1", "url": "https://backdropcms.org/", "upstream": { "license": "GPL-2.0", "website": "https://backdropcms.org/", "demo": "https://backdropcms.org/demo", "userdoc": "https://backdropcms.org/user-guide", - "code": "https://github.com/backdrop/backdrop" + "code": "https://github.com/backdrop/backdrop", + "cpe": "cpe:2.3:a:backdropcms:backdrop" }, "license": "GPL-2.0", "maintainer": { @@ -21,12 +22,12 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 6dc05ac..d862664 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-zip" diff --git a/scripts/restore b/scripts/restore index 2441075..3e04b61 100644 --- a/scripts/restore +++ b/scripts/restore @@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + #### Remove this function if there's nothing to clean before calling the remove script. + true +} ynh_abort_if_errors #================================================= @@ -33,16 +37,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -63,15 +62,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - -ynh_add_fpm_config - #================================================= # REINSTALL DEPENDENCIES #================================================= @@ -80,6 +70,20 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 33c0742..963d6f2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,14 +94,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=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -117,6 +109,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # GENERIC FINALIZATION #=================================================