From 5374a7f90f0f3211795135430427bc43127a006b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 09:13:02 +0200 Subject: [PATCH 1/6] Upgrade READMEs --- README.md | 10 +++++----- README_fr.md | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 307dc7f..f3144f5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Drupal for YunoHost -[![Integration level](https://dash.yunohost.org/integration/drupal.svg)](https://dash.yunohost.org/appci/app/drupal) +[![Integration level](https://dash.yunohost.org/integration/drupal.svg)](https://dash.yunohost.org/appci/app/drupal) ![](https://ci-apps.yunohost.org/ci/badges/drupal.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/drupal.maintain.svg) [![Install Drupal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=drupal) *[Lire ce readme en français.](./README_fr.md)* @@ -15,7 +15,7 @@ Free and open-source content management framework. ## Screenshots -![](https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Drupal_8_quickedit.png/300px-Drupal_8_quickedit.png) +![](https://www.drupal.org/files/issues/D7-screenshot.png) ## Documentation @@ -29,19 +29,19 @@ LDAP module can be installed #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/drupal/) ## Links * Report a bug: https://github.com/YunoHost-Apps/drupal_ynh/issues * App website: https://www.drupal.org + * Upstream app repository: https://github.com/drupal-composer/drupal-project * YunoHost website: https://yunohost.org/ --- -Developers info ----------------- +## Developers info Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/drupal_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 11c0fc2..3fb0287 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,11 +1,11 @@ # Drupal pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/drupal.svg)](https://dash.yunohost.org/appci/app/drupal) +[![Niveau d'intégration](https://dash.yunohost.org/integration/drupal.svg)](https://dash.yunohost.org/appci/app/drupal) ![](https://ci-apps.yunohost.org/ci/badges/drupal.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/drupal.maintain.svg) [![Install Drupal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=drupal) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Drupal rapidement et simplement sur un serveur Yunohost. +> *Ce package vous permet d'installer Drupal 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 @@ -25,23 +25,23 @@ Framework de gestion de contenu libre et open-source. #### Support multi-utilisateurs -Le module d'authentification LDAP peut être installé +Le module d'authentification LDAP peut être installé. #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/drupal%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/drupal/) ## Liens - * Signaler un bug: https://github.com/YunoHost-Apps/drupal_ynh/issues - * Site de l'application: https://www.drupal.org - * Site web YunoHost: https://yunohost.org/ + * Signaler un bug : https://github.com/YunoHost-Apps/drupal_ynh/issues + * Site de l'application : https://www.drupal.org + * Dépôt de l'application principale : https://github.com/drupal-composer/drupal-project + * Site web YunoHost : https://yunohost.org/ --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/drupal_ynh/tree/testing). From 119790b507316c70c2b4832a58f129bac43e515d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 09:13:19 +0200 Subject: [PATCH 2/6] Upgrade to upstream version --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 158ead5..48d4d24 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/ec0f41171516c18357ca4cda9068ee4cdeabaa19.tar.gz -SOURCE_SUM=aa94ea1e8a0cc382afb8e9f66b56af02ca7c60817403efc0e7b2a89c3dea09b8 +SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/34a8f939dc5967af34ad1039d3f5cf6b992a2d2d.tar.gz +SOURCE_SUM=f142078d8e96665f9089802293eb0aa9df501ff12135eb8e3c5821d6adfe8b5c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 911d7b0c39277cdca01c1cd48676c058b40630b8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 09:13:31 +0200 Subject: [PATCH 3/6] Clean up script --- scripts/backup | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/backup b/scripts/backup index fb90b69..bfbe182 100644 --- a/scripts/backup +++ b/scripts/backup @@ -33,25 +33,25 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info --message="Backing up php-fpm configuration..." ynh_backup --src_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf" @@ -67,7 +67,6 @@ ynh_mysql_dump_db --database="$db_name" > db.sql #================================================= # BACKUP A CRON FILE #================================================= -ynh_print_info --message="Backing up a cron file..." ynh_backup --src_path="/etc/cron.d/$app" From 3aba578ecc4705a357db816b5fc6307b1033347c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 09:22:00 +0200 Subject: [PATCH 4/6] Revert "Upgrade to upstream version" This reverts commit 119790b507316c70c2b4832a58f129bac43e515d. --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 48d4d24..158ead5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/34a8f939dc5967af34ad1039d3f5cf6b992a2d2d.tar.gz -SOURCE_SUM=f142078d8e96665f9089802293eb0aa9df501ff12135eb8e3c5821d6adfe8b5c +SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/ec0f41171516c18357ca4cda9068ee4cdeabaa19.tar.gz +SOURCE_SUM=aa94ea1e8a0cc382afb8e9f66b56af02ca7c60817403efc0e7b2a89c3dea09b8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 9c7be052ea99c841f0c3daca9651975e3b2ac15c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 09:35:23 +0200 Subject: [PATCH 5/6] Revert "Clean up script" This reverts commit 911d7b0c39277cdca01c1cd48676c058b40630b8. --- scripts/backup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index bfbe182..fb90b69 100644 --- a/scripts/backup +++ b/scripts/backup @@ -33,25 +33,25 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." - +# STANDARD BACKUP STEPS #================================================= # BACKUP THE APP MAIN DIR #================================================= +ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= +ynh_print_info --message="Backing up php-fpm configuration..." ynh_backup --src_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf" @@ -67,6 +67,7 @@ ynh_mysql_dump_db --database="$db_name" > db.sql #================================================= # BACKUP A CRON FILE #================================================= +ynh_print_info --message="Backing up a cron file..." ynh_backup --src_path="/etc/cron.d/$app" From f9e22915a487f8dde857e537d6f32f807e2dd063 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 3 Oct 2020 17:09:58 +0200 Subject: [PATCH 6/6] Fix screenshots --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3144f5..f4f47a6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Free and open-source content management framework. ## Screenshots -![](https://www.drupal.org/files/issues/D7-screenshot.png) +![](https://upload.wikimedia.org/wikipedia/commons/5/53/Drupal_8_quickedit.png) ## Documentation diff --git a/README_fr.md b/README_fr.md index 3fb0287..56aab87 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Framework de gestion de contenu libre et open-source. ## Captures d'écran -![](https://www.drupal.org/files/issues/D7-screenshot.png) +![](https://upload.wikimedia.org/wikipedia/commons/5/53/Drupal_8_quickedit.png) ## Documentation