diff --git a/README.md b/README.md index c00327a..e61507a 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 Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.). -**Shipped version:** 12.0.3 +**Shipped version:** 13.0.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 64fb8fd..9b7488e 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 Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.). -**Version incluse :** 12.0.3 +**Version incluse :** 13.0.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index bca29dc..eccb8c8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/12.0.3.tar.gz -SOURCE_SUM=672783519becbdd0d0fcbd43469d5d06f4d40d519317104e60cf29093402f700 +SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/13.0.0.tar.gz +SOURCE_SUM=87b136a936fca8c50de4c41478b26f79ce42b89091ca90b95c9589eba1ded64b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3b548f4..5f40d9d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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~ynh3", + "version": "13.0.0~ynh1", "url": "https://www.dolibarr.org/", "license": "GPL-3.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "url": "https://github.com/mastereur" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [ diff --git a/pull_request.md b/pull_request.md index c7f125a..6c28fc5 100644 --- a/pull_request.md +++ b/pull_request.md @@ -13,6 +13,4 @@ ## 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/dolibarr_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/dolibarr_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/backup b/scripts/backup index 67c8479..94a664e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -37,21 +37,18 @@ ynh_print_info --message="Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX 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_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -60,7 +57,6 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP LOGROTATE #================================================= -ynh_print_info --message="Backing up logrotate configuration..." ynh_backup --src_path="/etc/logrotate.d/$app" diff --git a/scripts/install b/scripts/install index 41b6ab4..1c32a25 100644 --- a/scripts/install +++ b/scripts/install @@ -135,9 +135,9 @@ ynh_replace_string --match_string="__SRCPATH__" --replace_string="$final_path" - chown -R $app: "$final_path" # Set the app as temporarily public for curl call -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Set the app as temporarily public for cURL call -ynh_permission_update --permission "main" --add "visitors" +ynh_permission_update --permission="main" --add="visitors" # Reload NGINX ynh_systemd_action --service_name=nginx --action=reload @@ -200,12 +200,6 @@ then fi fi -# Remove the public access -if [ $is_public -eq 0 ] -then - ynh_app_setting_delete --app=$app --key=skipped_uris -fi - #================================================= # MODIFY A CONFIG FILE #================================================= @@ -245,12 +239,12 @@ ynh_use_logrotate --logfile="$final_path/documents/dolibarr.log" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 0 ] then - ynh_permission_update --permission "main" --remove "visitors" + ynh_permission_update --permission="main" --remove="visitors" fi ynh_permission_create --permission "public access" --url "/public/" --allowed "visitors"