From cf23849f300634b3dc70999673c0433e3247eaaf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 7 Jan 2021 14:24:42 +0100 Subject: [PATCH] Fix --- README.md | 5 ++--- README_fr.md | 5 ++--- check_process | 3 --- manifest.json | 8 ++++---- pull_request.md | 22 +++++++++++++--------- scripts/_common.sh | 1 - scripts/backup | 4 ++-- scripts/change_url | 4 ++-- scripts/install | 18 ++++++++---------- scripts/remove | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 6 +++--- 12 files changed, 39 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 1beac67..c00327a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Dolibarr for YunoHost [![Integration level](https://dash.yunohost.org/integration/dolibarr.svg)](https://dash.yunohost.org/appci/app/dolibarr) ![](https://ci-apps.yunohost.org/ci/badges/dolibarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dolibarr.maintain.svg) -[![Install Dolibarr with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dolibarr) +[![Install Dolibarr with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dolibarr) *[Lire ce readme en français.](./README_fr.md)* @@ -57,8 +57,7 @@ Use the admin panel of your dolibarr to configure this app. --- -Developers info ----------------- +## Developers info Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index c385e42..64fb8fd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Dolibarr pour YunoHost [![Integration level](https://dash.yunohost.org/integration/dolibarr.svg)](https://dash.yunohost.org/appci/app/dolibarr) ![](https://ci-apps.yunohost.org/ci/badges/dolibarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dolibarr.maintain.svg) -[![Installer Dolibarr avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dolibarr) +[![Installer Dolibarr avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dolibarr) *[Read this readme in english.](./README.md)* @@ -57,8 +57,7 @@ Utilisez le panneau d'administration de votre Dolibarr pour configurer cette app --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing). diff --git a/check_process b/check_process index 08f0ddd..6eb9922 100644 --- a/check_process +++ b/check_process @@ -28,8 +28,6 @@ setup_root=1 upgrade=1 backup_restore=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none @@ -37,4 +35,3 @@ Notification=none ; commit=CommitHash name=5 Jul 2019 manifest_arg=domain=DOMAIN&path=PATH&admin=USER& - diff --git a/manifest.json b/manifest.json index 84c7340..779599e 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "dolibarr", "packaging_format": 1, "description": { - "en": "Manage the various aspects of your business or association (contacts, invoices, orders, stocks, agenda, etc...).", - "fr": "Gérez les différents aspects de votre activité pro ou associative (contacts, factures, commandes, stocks, agenda, etc...)." + "en": "Manage the various aspects of your business or association.", + "fr": "Gérez les différents aspects de votre activité pro ou associative." }, "version": "12.0.3~ynh2", "url": "https://www.dolibarr.org/", @@ -14,12 +14,12 @@ "url": "https://github.com/mastereur" }, "requirements": { - "yunohost": ">= 3.8.0" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/pull_request.md b/pull_request.md index 7617707..0287f9f 100644 --- a/pull_request.md +++ b/pull_request.md @@ -1,14 +1,18 @@ ## Problem -- *Normalization from example_ynh and some rework* +- *Description of why you made this PR* ## Solution -- *easier yunohost integration* +- *And how do you fix that problem* ## PR Status -- [X] Code finished. -- [X] Tested with Package_check. -- [X] Fix or enhancement tested. -- [X] Upgrade from last version tested. -- [X] Can be reviewed and tested. -- [X] Upgrade php version -- [X] Update dependancies +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Package_check results +--- +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5de49a8..b191aff 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,7 +18,6 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-mysql \ php${YNH_PHP_VERSION}-xml \ php${YNH_PHP_VERSION}-fileinfo" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index ae210e7..67c8479 100755 --- a/scripts/backup +++ b/scripts/backup @@ -44,14 +44,14 @@ ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." +ynh_print_info --message="Backing up NGINX web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info --message="Backing up php-fpm configuration..." +ynh_print_info --message="Backing up PHP-FPM configuration..." ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/change_url b/scripts/change_url index 9c78c4e..8927180 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -67,7 +67,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -106,7 +106,7 @@ ynh_replace_string --match_string="$old_domain$old_path" --replace_string="$new_ #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index cb1f84a..41b6ab4 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ touch $final_path/htdocs/conf/conf.php #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config @@ -96,7 +96,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm and install dependencies..." --weight=2 +ynh_script_progression --message="Configuring PHP-FPM and install dependencies..." --weight=2 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=medium --footprint=medium --package="$extra_php_dependencies" @@ -127,7 +127,6 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil ynh_replace_string --match_string="__MEMBER__" --replace_string="$member" --target_file="$fhook" ynh_replace_string --match_string="__SRCPATH__" --replace_string="$final_path" --target_file="$fhook" - #================================================= # SETUP APPLICATION WITH CURL #================================================= @@ -135,7 +134,6 @@ ynh_replace_string --match_string="__SRCPATH__" --replace_string="$final_path" - # Set right permissions for curl install chown -R $app: "$final_path" - # Set the app as temporarily public for curl call ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Set the app as temporarily public for cURL call @@ -176,7 +174,7 @@ ynh_local_curl "/install/step5.php" \ "pass=$password" \ "pass_verif=$password" -ynh_script_progression --message="configuring ldap" --weight=1 +ynh_script_progression --message="configuring LDAP" --weight=1 # Populate the LDAP parameters ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap.sql @@ -185,9 +183,9 @@ ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < .. ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap_user.sql if php $final_path/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then - ynh_print_info --message="ldap user update ok" + ynh_print_info --message="LDAP user update ok" else - ynh_print_warn --message="ldap user update ended with error" + ynh_print_warn --message="LDAP user update ended with error" fi # If YNH users should be members, populate the database accordingly, create the member list, and sync members @@ -196,9 +194,9 @@ then ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap_member.sql if php $final_path/scripts/members/sync_members_ldap2dolibarr.php commitiferror 1 --server=localhost -y; then - ynh_print_info --message="ldap member update ok" + ynh_print_info --message="LDAP member update ok" else - ynh_print_warn --message="ldap member update ended with error" + ynh_print_warn --message="LDAP member update ended with error" fi fi @@ -260,7 +258,7 @@ ynh_permission_create --permission "public access" --url "/public/" --allowed "v #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 17cbdd6..fb9a1fe 100644 --- a/scripts/remove +++ b/scripts/remove @@ -43,7 +43,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config @@ -51,7 +51,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index e3c3f42..21ee012 100755 --- a/scripts/restore +++ b/scripts/restore @@ -117,7 +117,7 @@ chmod go-w $datadir #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index a075097..7d0d1ab 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config @@ -125,7 +125,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Delete old static pool.d conf old_php_version=7.0 @@ -212,7 +212,7 @@ chmod go-w $datadir #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload