From 03f3febf7447225191359c90a8e187056c1e0e00 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 17 Jun 2020 20:19:27 +0200 Subject: [PATCH] Upgrade (#18) * Update source to 0.9.5 --- .../pull_request_template.md | 16 ++++++------ conf/app.src | 4 +-- conf/nginx.conf | 26 +++++++++++-------- manifest.json | 8 +++++- scripts/_common.sh | 5 ++-- scripts/change_url | 1 + scripts/install | 4 +-- scripts/upgrade | 18 ++++++++++--- 8 files changed, 53 insertions(+), 29 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index 0922b30..9979eb1 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -1,18 +1,18 @@ ## Problem -- +- ## Solution -- +- ## PR Status -- +- ## Validation --- *Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20xxx%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/nextcloud_ynh%20xxx%20(Official)/) +- **Upgrade previous version** : +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +- [ ] **Approval (LGTM)** : +- **CI succeeded** : [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20xxx%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/nextcloud_ynh%20xxx%20(Official)/) When the PR is mark as ready to merge, you have to wait for 3 days before really merge it. diff --git a/conf/app.src b/conf/app.src index e58db5a..793816f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.5.tar.bz2 -SOURCE_SUM=48f8d62d8c86b3aef2d090b2a7d04873c9642d6efc451389f58a5d6e89d89612 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.6.tar.bz2 +SOURCE_SUM=a0c4dcc6adc25a6f093bc09b0ed4c7efcbfde0726b790431c293112800ccc282 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 8328b41..af69520 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,21 +5,25 @@ alias __FINALPATH__/www/ ; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; -} + } - # Example PHP configuration (remove if not used) + # Example PHP configuration (remove if not used) index index.php /_route.php; try_files $uri $uri/ index.php /_route.php; -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; -} + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } + + # Increase size limit + client_max_body_size 2M; + # PHP configuration end # Include SSOWAT user panel. diff --git a/manifest.json b/manifest.json index 5424020..6a94ac3 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,9 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "0.9.5~ynh3", + + "version": "0.9.6~ynh3", + "url": "http://garradin.eu/a-propos/", "license": "GPL-3.0-or-later", "maintainer": { @@ -49,6 +51,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "The SSO is not implemented for this app and yunohost is not sure for hundred of users...", + "fr": "Le SSO n'est pas implémenté pour cette application et yunohost n'est pas sûr pour une centaine d'utilisateurs..." + }, "default": true } ] diff --git a/scripts/_common.sh b/scripts/_common.sh index 3b3d4c5..768fbe1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,8 @@ #================================================= # dependencies used by the app -pkg_dependencies="php7.0-sqlite3" + +pkg_dependencies="php-sqlite3" # ============= FUTURE YUNOHOST HELPER ============= @@ -42,4 +43,4 @@ ynh_permission_has_user() { allowed_users="$(echo "$perm" | grep --invert-match '^#')" # Grep the list of users an return the result if the user is indeed into the list echo "$allowed_users" | grep --quiet --word "$user" - } \ No newline at end of file +} diff --git a/scripts/change_url b/scripts/change_url index 7244972..64f0a01 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -58,6 +58,7 @@ fi # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating nginx web server configuration..." --time --weight=1 + nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf final_path=/var/www/$app diff --git a/scripts/install b/scripts/install index 2f74e58..ec67600 100644 --- a/scripts/install +++ b/scripts/install @@ -46,10 +46,9 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= ynh_script_progression --message="Storing installation settings..." --time --weight=1 + ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public - #================================================= # Install dependency to convert tracks to a readable format for the browser @@ -62,6 +61,7 @@ ynh_install_app_dependencies $pkg_dependencies # CREATE DEDICATED USER #================================================= ynh_script_progression --message="Configuring system user..." --time --weight=1 + # Create a system user ynh_system_user_create --username=$app diff --git a/scripts/upgrade b/scripts/upgrade index e8c4e31..a708b02 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,9 +49,9 @@ fi # is_public=$(ynh_app_setting_get --app=$app --key=is_public) if [ -n "$is_public" ]; then - # Remove unprotected_uris - ynh_app_setting_delete --app=$app --key=unprotected_uris - + # Remove protected_uris + ynh_app_setting_delete --app=$app --key=protected_uris + #Removing skipped/unprotected_uris under certain conditions, remove the visitors group added during the migration process of 3.7 #Remove skipped_uris. If the app was public, add visitors again to the main permission if ynh_permission_has_user --permission=main --user=visitors @@ -94,6 +94,18 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +# #================================================= +# # CHECK THE PATH +# #================================================= + +# Normalize the URL path syntax +# N.B. : this is for app installations before YunoHost 2.7 +# where this value might be something like /foo/ or foo/ +# instead of /foo .... +# If nobody installed your app before 2.7, then you may +# safely remove this line +#path_url=$(ynh_normalize_url_path --path_url=$path_url) + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================