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/check_process b/check_process index 88a7a7e..5e6b4fb 100644 --- a/check_process +++ b/check_process @@ -13,6 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e backup_restore=1 multi_instance=1 wrong_user=1 @@ -33,3 +34,7 @@ Level 8=0 Level 9=0 Level 10=0 +;;; Upgrade options + ; commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e + name=Create check_process + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=Yes& 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..20feeeb 100644 --- a/manifest.json +++ b/manifest.json @@ -5,13 +5,17 @@ "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": "jibec", + "email": "jean-baptiste@holcroft.fr" + }, + "previous_maintainers": { "name": "mbugeia", "email": "maxime@max.privy.place" }, diff --git a/scripts/install b/scripts/install index 057a26d..4074896 100644 --- a/scripts/install +++ b/scripts/install @@ -150,6 +150,9 @@ then # ynh panel is only comptable with non-root installation ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" + ynh_store_file_checksum "$finalnginxconf" +else + ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf" fi @@ -161,6 +164,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/restore b/scripts/restore index f7be894..a255591 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,7 +89,8 @@ ynh_system_user_create "$app" #================================================= chown -R root:root "$final_path" -chown -R "$app" "$final_path"/{data,plugins} +chown -R "$app" "$final_path"/{data,plugins,sessions} +chmod -R 700 "$final_path"/sessions #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 33ced7a..71a723f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,6 +164,9 @@ then # ynh panel is only comptable with non-root installation ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" + ynh_store_file_checksum "$finalnginxconf" +else + ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf" fi @@ -175,6 +178,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 #=================================================