From 042d5836c0896205472d9ccf3bd4875c58be8613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 2 Apr 2020 21:28:13 +0200 Subject: [PATCH 1/4] change app name to tag to be replaced --- hooks/post_app_addaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/post_app_addaccess b/hooks/post_app_addaccess index d8d976a..a66e3d5 100755 --- a/hooks/post_app_addaccess +++ b/hooks/post_app_addaccess @@ -7,7 +7,7 @@ app_path=/var/www/$app . /usr/share/yunohost/helpers -if [[ "freshrss" = "$app" ]]; +if [[ "APPNAMETOCHANGE" = "$app" ]]; then for myuser in $(echo "$new_users" | sed "s/,/ /g") do From a4cb702ff3cd76958a04b0f1c6dc024dc57cf01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 2 Apr 2020 21:28:46 +0200 Subject: [PATCH 2/4] replace tags in hooks on install --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 522d365..0c4f4d3 100755 --- a/scripts/install +++ b/scripts/install @@ -111,6 +111,10 @@ ynh_add_fpm_config #================================================= # SPECIFIC SETUP #================================================= +ynh_replace_string "APPNAMETOCHANGE" $app ../hooks/post_app_addaccess +ynh_replace_string "APPNAMETOCHANGE" $app ../hooks/post_user_create +ynh_replace_string "APPNAMETOCHANGE" $app ../hooks/post_user_delete + # SETUPING FRESHRSS #================================================= ynh_print_info --message="FreshRSS setup script..." From 92588aec77c469e4c1f92a5b7b36a7761cf91b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sun, 5 Apr 2020 09:48:43 +0200 Subject: [PATCH 3/4] fix api check --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 0c4f4d3..a271d72 100755 --- a/scripts/install +++ b/scripts/install @@ -161,9 +161,9 @@ chown -R $app: $final_path/extensions/ ynh_print_info --message="Configuring SSOwat..." #skip api directory -ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/api/,/scripts/api.js" +ynh_app_setting_set --app="$app" --key=skipped_uris --value="/api/,/scripts/api.js" ynh_app_setting_delete --app="$app" --key=unprotected_regex -ynh_app_setting_delete --app="$app" --key=skipped_uris +ynh_app_setting_delete --app="$app" --key=unprotected_uris #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index bb0d7ba..886e5c9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -180,9 +180,9 @@ $final_path/cli/reconfigure.php --default_user $admin --auth_type http_auth --en #================================================= ynh_print_info --message="Upgrading SSOwat configuration..." -ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/api/,/scripts/api.js" +ynh_app_setting_set --app="$app" --key=skipped_uris --value="/api/,/scripts/api.js" ynh_app_setting_delete --app="$app" --key=unprotected_regex -ynh_app_setting_delete --app="$app" --key=skipped_uris +ynh_app_setting_delete --app="$app" --key=unprotected_uris #================================================= # RELOAD NGINX From c5e2049d9b89c64ae8691d0a0a3add8cc5a134a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sun, 5 Apr 2020 09:49:23 +0200 Subject: [PATCH 4/4] remove ynh tile which cause js bugs --- conf/nginx.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d0b9555..4cc8174 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,7 @@ location __PATH__/ { 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; @@ -19,7 +19,4 @@ location __PATH__/ { fastcgi_param SCRIPT_FILENAME $request_filename; } ### End of PHP configuration part - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; }