diff --git a/README.md b/README.md index 1c78a7a..c42f7a1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it. -**Shipped version:** 4.2.0 +**Shipped version:** 4.3.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 459c6ea..4c8919d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Jirafeau est un site web permettant d'héberger et de partager des fichiers de manière simple en leur donnant un lien unique. -**Version incluse :** 4.2.0 +**Version incluse :** 4.3.0 ## Captures d'écran diff --git a/check_process b/check_process index 46b5c5f..6d53de5 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ upgrade=1 from_commit=48ed2dc5b80ed7f1ddd39a46917f993a8c4207d5 backup_restore=1 multi_instance=0 - incorrect_path=1 port_already_use=0 change_url=1 ;;; Options diff --git a/conf/app.src b/conf/app.src index 8de9343..e5786d4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/mojo42/Jirafeau/repository/4.2.0/archive.tar.gz -SOURCE_SUM=8ee7cb509c5e55c569514d9a168af819c93bd9bf48ee417d66aecdcdac49974e +SOURCE_URL=https://gitlab.com/mojo42/Jirafeau/repository/4.3.0/archive.tar.gz +SOURCE_SUM=435675a2b19d70155c5c3b1ee192582668f17696a040d8051bcdf9eea24dc1da SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index e5b517e..ecb2372 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -32,7 +32,6 @@ location __PATH__/ { deny all; } - location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; diff --git a/manifest.json b/manifest.json index 8daa75c..3581bff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Upload a file in a simple way and give a unique link to it", "fr": "Hébergez simplement un fichier et partagez-le avec un lien unique" }, - "version": "4.2.0~ynh1", + "version": "4.3.0~ynh1", "url": "https://gitlab.com/mojo42/Jirafeau", "license": "AGPL-3.0-only", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": false, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ diff --git a/pull_request_template.md b/pull_request_template.md index c651d32..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/jirafeau_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/jirafeau_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +* 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/install b/scripts/install index 19bde6f..aa9a32f 100755 --- a/scripts/install +++ b/scripts/install @@ -156,9 +156,10 @@ chmod -R 700 $var_root #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=2 +ynh_script_progression --message="Configuring permissions..." --weight=2 + +ynh_permission_update --permission="main" --add="visitors" -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" if [ $is_public -eq 0 ] then domain_regex=$(echo "$domain" | sed 's@-@.@g') diff --git a/scripts/upgrade b/scripts/upgrade index 9b6b335..2709197 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -237,9 +237,10 @@ chmod -R 700 $var_root #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 +ynh_script_progression --message="Configuring permissions..." --weight=2 + +ynh_permission_update --permission="main" --add="visitors" -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" if [ $is_public -eq 0 ] then domain_regex=$(echo "$domain" | sed 's@-@.@g')