From 2944a7a2cc900633246ff21646b2bc58d1fd36e8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 13 Jul 2019 15:25:07 +0200 Subject: [PATCH 1/5] Update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 48d2a8c..4d860c7 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ LDAP module can be installed Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/drupal7_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/README_fr.md b/README_fr.md index c89512c..69c5654 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,7 +44,6 @@ le module d'authentification LDAP peut être installé Informations pour les développeurs ---------------- -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/drupal7_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. From 2fa47a3e8c5a9b9cce46c4b74c92aa24988e3985 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 5 Aug 2019 01:49:00 +0200 Subject: [PATCH 2/5] Change default path --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5175f83..be752f8 100644 --- a/manifest.json +++ b/manifest.json @@ -38,8 +38,8 @@ "en": "Choose a path for Drupal 7", "fr": "Choisissez un chemin pour Drupal 7" }, - "example": "/example", - "default": "/example" + "example": "/drupal7", + "default": "/drupal7" }, { "name": "admin", From 2937b21da83b6038ee0b42d431d17b01cf3e44d6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 5 Aug 2019 03:13:13 +0200 Subject: [PATCH 3/5] Fix php cli --- scripts/install | 4 ++++ scripts/upgrade | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index 2f090bf..97fd265 100644 --- a/scripts/install +++ b/scripts/install @@ -144,6 +144,8 @@ ynh_print_info --message="Installing Drupal..." chown -R $app: $final_path +update-alternatives --set php /usr/bin/php7.2 + pushd "$final_path" sudo -u $app env PATH=$PATH drush pm-download drupal-7 --drupal-project-rename=$app popd @@ -162,6 +164,8 @@ sudo -u $app env PATH=$PATH drush @$app l10n-update sudo -u $app env PATH=$PATH drush @$app pm-update sudo -u $app env PATH=$PATH drush @$app core-cron +update-alternatives --set php /usr/bin/php7.0 + #================================================= # SETUP THE CRON FILE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 739335f..8b98d17 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,6 +130,8 @@ ynh_print_info --message="Upgrading Drupal..." ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php" export PATH="$final_path/.composer/vendor/bin:$PATH" +update-alternatives --set php /usr/bin/php7.2 + sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 sudo -u $app env PATH=$PATH drush @$app cache-clear all sudo -u $app env PATH=$PATH drush @$app pm-update -y drupal @@ -138,6 +140,8 @@ sudo -u $app env PATH=$PATH drush @$app cache-clear all sudo -u $app env PATH=$PATH drush @$app l10n-update-refresh sudo -u $app env PATH=$PATH drush @$app l10n-update +update-alternatives --set php /usr/bin/php7.0 + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= From 70cc6cca87ca0eb52fd4b59d3ba14b376b633593 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 29 Nov 2019 04:53:26 +0100 Subject: [PATCH 4/5] Improve description --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5175f83..1441065 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "drupal7", "packaging_format": 1, "description": { - "en": "Drupal 7 for YunoHost application.", - "fr": "Drupal 7 pour YunoHost." + "en": "A content management framework written in PHP", + "fr": "Un système de gestion de contenu écrit en PHP" }, "version": "7.67~ynh1", "url": "https://www.drupal.org", From 08e7ad28fb8f238ba27fbfb180838a485e64e19a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 23 Dec 2019 21:35:03 +0100 Subject: [PATCH 5/5] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 493b064..a512143 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "drupal7", "packaging_format": 1, "description": { - "en": "A content management framework written in PHP", - "fr": "Un système de gestion de contenu écrit en PHP" + "en": "Old version of a content management framework written in PHP", + "fr": "Ancienne version d'un système de gestion de contenu écrit en PHP" }, "version": "7.67~ynh1", "url": "https://www.drupal.org",