From 6c1fa0172983875fb76e5e6cd06c358b65358f16 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 23 Oct 2021 16:50:06 +0200 Subject: [PATCH 1/4] Fix disclaimer/description encoding making autoreadme crash --- doc/DESCRIPTION_fr.md | 2 +- doc/DISCLAIMER_fr.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 59ce298..b5b34b9 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Gestion des relations avec les constituants (GRC/CRM) pour les organisations à but non lucratif, les ONG et les organisations de défense des droits. +Gestion des relations avec les constituants (GRC/CRM) pour les organisations à but non lucratif, les ONG et les organisations de défense des droits. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 277bd33..7a8ff5f 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,2 +1,2 @@ -* Toute limitation connue, contrainte ou élément qui ne fonctionne pas, comme (mais sans s'y limiter) : - * Le module d'authentification LDAP peut être installé +* Toute limitation connue, contrainte ou élément qui ne fonctionne pas, comme (mais sans s'y limiter) : + * Le module d'authentification LDAP peut être installé From 8a1c2537e14a7ce9339253c407567be1bd8e4df1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 23 Oct 2021 14:50:24 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 45 +++++++++++++++++++++++---------------------- README_fr.md | 47 ++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index a3935d8..15190c9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # CiviCRM on Drupal 7 for YunoHost [![Integration level](https://dash.yunohost.org/integration/civicrm_drupal7.svg)](https://dash.yunohost.org/appci/app/civicrm_drupal7) ![](https://ci-apps.yunohost.org/ci/badges/civicrm_drupal7.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/civicrm_drupal7.maintain.svg) @@ -5,40 +10,34 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install CiviCRM on Drupal 7 quickly and simply on a YunoHost server. +> *This package allows you to install CiviCRM on Drupal 7 quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview + Open source constituent relationship management (CRM) for non-profits, NGOs and advocacy organizations. -**Shipped version:** 5.38.0 on Drupal 7 + +**Shipped version:** 5.38.0-7.0~ynh1 + +**Demo:** https://civicrm.org/demo ## Screenshots -![](https://skvare.com/sites/skvare.com/files/civicrm-contact-record-skvare.png) +![](./doc/screenshots/screenshot.png) -## Documentation +## Disclaimers / important information - * Official documentation: https://docs.civicrm.org/ +* Any known limitations, constrains or stuff not working, such as (but not limited to): + * LDAP module can be installed -## YunoHost specific features +## Documentation and resources -#### Multi-user support - -LDAP module can be installed - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/civicrm_drupal7.svg)](https://ci-apps.yunohost.org/ci/apps/civicrm_drupal7/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/civicrm_drupal7.svg)](https://ci-apps-arm.yunohost.org/ci/apps/civicrm_drupal7/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/issues - * App website: https://civicrm.org/ - * YunoHost website: https://yunohost.org/ - ---- +* Official app website: https://civicrm.org/ +* Official admin documentation: https://docs.civicrm.org/ +* Upstream app code repository: https://github.com/civicrm/civicrm-drupal +* YunoHost documentation for this app: https://yunohost.org/app_civicrm_drupal7 +* Report a bug: https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/issues ## Developer info @@ -50,3 +49,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/t or sudo yunohost app upgrade civicrm_drupal7 -u https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 65c3eec..c13fb17 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,44 +1,39 @@ -# CiviCRM pour Drupal 7 pour YunoHost +# CiviCRM on Drupal 7 pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/civicrm_drupal7.svg)](https://dash.yunohost.org/appci/app/civicrm_drupal7) ![](https://ci-apps.yunohost.org/ci/badges/civicrm_drupal7.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/civicrm_drupal7.maintain.svg) [![Installer CiviCRM on Drupal 7 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=civicrm_drupal7) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer CiviCRM on Drupal 7 rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +> *Ce package vous permet d'installer CiviCRM on Drupal 7 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 + 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.38.0 et Drupal 7 + +**Version incluse :** 5.38.0-7.0~ynh1 + +**Démo :** https://civicrm.org/demo ## Captures d'écran -![](https://skvare.com/sites/skvare.com/files/civicrm-contact-record-skvare.png) +![](./doc/screenshots/screenshot.png) -## Documentation +## Avertissements / informations importantes - * Documentation officielle: https://docs.civicrm.org/ +* Toute limitation connue, contrainte ou élément qui ne fonctionne pas, comme (mais sans s'y limiter) : + * Le module d'authentification LDAP peut être installé -## Caractéristiques spécifiques YunoHost +## Documentations et ressources -#### Support multi-utilisateur - -Le module d'authentification LDAP peut être installé - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/civicrm_drupal7.svg)](https://ci-apps.yunohost.org/ci/apps/civicrm_drupal7/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/civicrm_drupal7.svg)](https://ci-apps-arm.yunohost.org/ci/apps/civicrm_drupal7/) - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/issues - * Site de l'application : https://civicrm.org/ - * Site web YunoHost: https://yunohost.org/ - ---- +* Site officiel de l'app : https://civicrm.org/ +* Documentation officielle de l'admin : https://docs.civicrm.org/ +* Dépôt de code officiel de l'app : https://github.com/civicrm/civicrm-drupal +* Documentation YunoHost pour cette app : https://yunohost.org/app_civicrm_drupal7 +* Signaler un bug : https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/issues ## Informations pour les développeurs @@ -50,3 +45,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/t ou sudo yunohost app upgrade civicrm_drupal7 -u https://github.com/YunoHost-Apps/civicrm_drupal7_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From 2387a2dfe5d1c8dab2c15e23cccee6185f33576c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 29 Nov 2021 08:20:57 +0100 Subject: [PATCH 3/4] 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 From c89f4ab3b513ebb5d625ca28d2144b2315a59b71 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 29 Nov 2021 07:21:03 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15190c9..eefb74f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open source constituent relationship management (CRM) for non-profits, NGOs and advocacy organizations. -**Shipped version:** 5.38.0-7.0~ynh1 +**Shipped version:** 5.38.0.7.0~ynh1 **Demo:** https://civicrm.org/demo diff --git a/README_fr.md b/README_fr.md index c13fb17..9584481 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.38.0-7.0~ynh1 +**Version incluse :** 5.38.0.7.0~ynh1 **Démo :** https://civicrm.org/demo