From 35d02fec9d74216362fe700e630de2572c092dee Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 5 Aug 2019 01:48:52 +0200 Subject: [PATCH 1/5] Change default path --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index bb9216b..15dc1f4 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 35ac7fcd45783371922b2db74cf8600a25235f11 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 5 Aug 2019 03:12:58 +0200 Subject: [PATCH 2/5] fix PHP cli --- scripts/install | 4 ++++ scripts/upgrade | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index 5f1f6b6..347c210 100644 --- a/scripts/install +++ b/scripts/install @@ -144,6 +144,8 @@ ynh_print_info --message="Installing Drupal and CiviCRM..." 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 -y drupal-7 --drupal-project-rename=$app popd @@ -170,6 +172,8 @@ chmod 755 $final_path/$app/sites/default/ sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/civicrm/drupal/drush" @$app civicrm-install --dbhost="localhost" --dbname="$db_name" --dbpass="$db_pwd" --dbuser="$db_user" --destination="sites/all/modules" --site_url="$domain$path_url" --ssl=on +update-alternatives --set php /usr/bin/php7.0 + #================================================= # SETUP THE CRON FILE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 1117929..fa1d19c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,6 +133,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 @@ -147,6 +149,8 @@ sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/ sudo -u $app env PATH=$PATH drush @$app vset --exact maintenance_mode 0 +update-alternatives --set php /usr/bin/php7.0 + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= From c6d24358b8dd35928ee4a779396eef21c95595ad Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 00:12:02 +0100 Subject: [PATCH 3/5] Update ynh_install_php__3 --- scripts/ynh_install_php__3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index 75bb6db..b5f7bda 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -37,8 +37,9 @@ ynh_install_php () { # Set php7.0 back as the default version for php-cli. update-alternatives --set php /usr/bin/php7.0 - # Remove this extra repository after packages are installed - ynh_remove_extra_repo --name=extra_php_version + # Pin this extra repository after packages are installed to prevent sury of doing shit + ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" From 599f21b6e7de9c8323e09c49e209575f10d1d019 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 14:13:43 +0100 Subject: [PATCH 4/5] Update ynh_install_php__3 --- scripts/ynh_install_php__3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index b5f7bda..ca72f7f 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -39,7 +39,7 @@ ynh_install_php () { # Pin this extra repository after packages are installed to prevent sury of doing shit ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version - ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version --append # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" From 5b77e518400d960bf1f1d791fbcb4ee460afeb6e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 7 Jan 2020 23:52:17 +0100 Subject: [PATCH 5/5] Upgrade 5.21.0 --- README.md | 2 +- README_fr.md | 2 +- conf/civicrm-drupal.src | 4 ++-- conf/civicrm-l10n.src | 4 ++-- manifest.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ac71cf4..445bf01 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Open source constituent relationship management (CRM) for non-profits, NGOs and advocacy organizations. -**Shipped version:** 5.15.1 on Drupal 7 +**Shipped version:** 5.21.0 on Drupal 7 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 49bb370..60cfd6b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Gestion des relations avec les constituants (GRC/CRM) pour les organisations à but non lucratif, les ONG et les organisations de défense des droits. -**Version incluse:** 5.15.1 et Drupal 7 +**Version incluse:** 5.21.0 et Drupal 7 ## Captures d'écran diff --git a/conf/civicrm-drupal.src b/conf/civicrm-drupal.src index 67f8f92..eba16f2 100644 --- a/conf/civicrm-drupal.src +++ b/conf/civicrm-drupal.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.15.1/civicrm-5.15.1-drupal.tar.gz -SOURCE_SUM=15cc4061a6342bf626d8a04c7c593c87631f9b2b01963ddf003124e10ab38870 +SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.21.0/civicrm-5.21.0-drupal.tar.gz +SOURCE_SUM=0662b2df0d9bd0896203f9aeccf39c76e0d6dc2e877a7db6d245d61d96c259bc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/civicrm-l10n.src b/conf/civicrm-l10n.src index 56a5094..ee82516 100644 --- a/conf/civicrm-l10n.src +++ b/conf/civicrm-l10n.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.15.1/civicrm-5.15.1-l10n.tar.gz -SOURCE_SUM=ffd7d254dee5ecf8ef3a04b1e2b741158388a56be81fdf6fc05bed491de815b2 +SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.21.0/civicrm-5.21.0-l10n.tar.gz +SOURCE_SUM=789d74298818896eafa026f8438925b37826ce58c594868adaba12323b76043a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 15dc1f4..870d214 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CRM for non-profits, NGOs and advocacy organizations.", "fr": "CRM pour organisations à but non lucratif et ONG." }, - "version": "5.15.1-7.0~ynh1", + "version": "5.21.0-7.0~ynh1", "url": "https://civicrm.org", "license": "AGPL-3.0-or-later", "maintainer": {