From 8f7145e094913652467d255ebf576032a4f9f513 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Thu, 18 Jan 2018 18:55:08 +0100 Subject: [PATCH 1/3] upgrade to 1.20, fix nginx issue, open jsonrpc for kandroid --- README.md | 2 +- conf/app.src | 6 +++--- conf/nginx.conf | 3 ++- manifest.json | 6 +++--- scripts/install | 4 ++++ scripts/upgrade | 4 ++++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0347cf1..ce7cdd4 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ From command line: Infos ----- -Kanboard v1.0.48 +Kanboard v1.2.0 Yunohost forum thread: diff --git a/conf/app.src b/conf/app.src index 8ee6638..c38ee7b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/kanboard/kanboard/releases/download/v1.0.48/kanboard-1.0.48.zip -SOURCE_SUM=a15f63f7582869fd9c777313bbb3cefbe3e4db34bae550b76e1e37d9c4b35a67 +SOURCE_URL=https://github.com/kanboard/kanboard/archive/v1.2.0.tar.gz +SOURCE_SUM=0f7bc706ba8a6ac5223c69e6a8390e034b306ddd3d2663ba8f340355a4a69977 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz diff --git a/conf/nginx.conf b/conf/nginx.conf index 45d88b9..c11efaa 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location __PATH__ { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { alias __FINALPATH__/; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; diff --git a/manifest.json b/manifest.json index 6177e36..3b22367 100644 --- a/manifest.json +++ b/manifest.json @@ -5,15 +5,15 @@ "description": { "en": "Kanboard is a simple visual task board web application" }, - "version": "1.0.48", + "version": "1.2.0-0", "url": "https://kanboard.net/", "license": "AGPL-3.0", "requirements": { "yunohost": ">= 2.7.0" }, "maintainer": { - "name": "mbugeia", - "email": "maxime@max.privy.place" + "name": "jibec", + "email": "jean-baptiste@holcroft.fr" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 057a26d..0a97fdd 100644 --- a/scripts/install +++ b/scripts/install @@ -151,6 +151,8 @@ then ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf" +else + ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" fi # Make app public or private @@ -161,6 +163,8 @@ then ynh_replace_string "define('HIDE_LOGIN_FORM'.*$" "define('HIDE_LOGIN_FORM', false);" "$config_php" ynh_replace_string "define('REMEMBER_ME_AUTH'.*$" "define('REMEMBER_ME_AUTH', true);" "$config_php" ynh_replace_string "define('DISABLE_LOGOUT'.*$" "define('DISABLE_LOGOUT', false);" "$config_php" +else + ynh_app_setting_set "$app" unprotected_uris "/jsonrpc.php" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 33ced7a..cf1d869 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -165,6 +165,8 @@ then ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf" +else + ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" fi # Make app public or private @@ -175,6 +177,8 @@ then ynh_replace_string "define('HIDE_LOGIN_FORM'.*$" "define('HIDE_LOGIN_FORM', false);" "$config_php" ynh_replace_string "define('REMEMBER_ME_AUTH'.*$" "define('REMEMBER_ME_AUTH', true);" "$config_php" ynh_replace_string "define('DISABLE_LOGOUT'.*$" "define('DISABLE_LOGOUT', false);" "$config_php" +else + ynh_app_setting_set "$app" unprotected_uris "/jsonrpc.php" fi #================================================= From d2462a023bcdf2db28e55cf4b67ca63671c439d3 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 31 Jan 2018 12:50:23 +0100 Subject: [PATCH 2/3] Update nginx conf file checksum --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 0a97fdd..4074896 100644 --- a/scripts/install +++ b/scripts/install @@ -153,6 +153,7 @@ then ynh_store_file_checksum "$finalnginxconf" else ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" + ynh_store_file_checksum "$finalnginxconf" fi # Make app public or private From d958d99b3cbc4f5135054265d38668251626b251 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 31 Jan 2018 12:50:58 +0100 Subject: [PATCH 3/3] Update nginx conf file checksum --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index cf1d869..71a723f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -167,6 +167,7 @@ then ynh_store_file_checksum "$finalnginxconf" else ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" + ynh_store_file_checksum "$finalnginxconf" fi # Make app public or private