Merge pull request #9 from YunoHost-Apps/testing

Testing

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
 

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
 

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

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

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": {
@@ -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",

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
 #=================================================

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
 #=================================================

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"