From 2387a2dfe5d1c8dab2c15e23cccee6185f33576c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 29 Nov 2021 08:20:57 +0100 Subject: [PATCH] 4.3 --- conf/civicrm-drupal.src | 1 - conf/civicrm-l10n.src | 1 - conf/nginx.conf | 5 ----- manifest.json | 9 ++++----- scripts/_common.sh | 5 +---- scripts/install | 5 +++-- scripts/restore | 8 +------- scripts/upgrade | 4 +--- 8 files changed, 10 insertions(+), 28 deletions(-) diff --git a/conf/civicrm-drupal.src b/conf/civicrm-drupal.src index 15b5f15..ff551d1 100644 --- a/conf/civicrm-drupal.src +++ b/conf/civicrm-drupal.src @@ -3,4 +3,3 @@ SOURCE_SUM=991e31f1b6cbabaf8747b0d9b2c7859485fefc72bf4dfe21c8468fb32b5896a5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/civicrm-l10n.src b/conf/civicrm-l10n.src index 15b5f15..ff551d1 100644 --- a/conf/civicrm-l10n.src +++ b/conf/civicrm-l10n.src @@ -3,4 +3,3 @@ SOURCE_SUM=991e31f1b6cbabaf8747b0d9b2c7859485fefc72bf4dfe21c8468fb32b5896a5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index f9fefba..442848d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,11 +9,6 @@ location __PATH__/ { rewrite ^__PATH__/(.+)$ __PATH__/index.php?q=$1 last; } - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/manifest.json b/manifest.json index e61c1ab..85940be 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "civicrm_drupal7", "packaging_format": 1, "description": { - "en": "CRM for non-profits, NGOs and advocacy organizations.", - "fr": "CRM pour organisations à but non lucratif et ONG." + "en": "CRM for non-profits, NGOs and advocacy organizations", + "fr": "CRM pour organisations à but non lucratif et ONG" }, - "version": "5.38.0-7.0~ynh1", + "version": "5.38.0.7.0~ynh1", "url": "https://civicrm.org", "upstream": { "license": "AGPL-3.0-or-later", @@ -61,8 +61,7 @@ }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" }, { "name": "install_profil", diff --git a/scripts/_common.sh b/scripts/_common.sh index 81d04ab..e5daee9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,12 +4,9 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -pkg_dependencies="curl libzip-dev" - YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-soap" +pkg_dependencies="curl libzip-dev php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-soap" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index e807b9e..1358eb3 100644 --- a/scripts/install +++ b/scripts/install @@ -31,6 +31,7 @@ language=$YNH_APP_ARG_LANGUAGE password=$YNH_APP_ARG_PASSWORD install_profil=$YNH_APP_ARG_INSTALL_PROFIL admin_mail=$(ynh_user_get_info --username=$admin --key=mail) +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -55,6 +56,7 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=install_profil --value=$install_profil +ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # STANDARD MODIFICATIONS @@ -109,8 +111,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +ynh_add_fpm_config --usage=low --footprint=low #================================================= # SPECIFIC SETUP diff --git a/scripts/restore b/scripts/restore index 21978e7..40f3f7a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -39,8 +39,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -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 @@ -75,13 +74,8 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Restoring the PHP-FPM configuration..." -# Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4bed7d2..51bb121 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -106,8 +105,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +ynh_add_fpm_config --usage=low --footprint=low #================================================= # SPECIFIC UPGRADE