diff --git a/docker/frontend-apache.conf b/docker/frontend-apache.conf index 60e7c2b..5f22676 100644 --- a/docker/frontend-apache.conf +++ b/docker/frontend-apache.conf @@ -72,6 +72,11 @@ SetHandler form-login-handler Use Auth AuthFormLoginSuccessLocation "/panel/" + + SetHandler form-logout-handler + AuthFormLogoutLocation "/login/logout.html" + Session on + AllowOverride none diff --git a/docker/frontend-login/logout.html b/docker/frontend-login/logout.html new file mode 100644 index 0000000..b6f088a --- /dev/null +++ b/docker/frontend-login/logout.html @@ -0,0 +1,8 @@ + + + +

You have been logged out.

+ +

Login again?

+ + diff --git a/docker/ttrss-config.php b/docker/ttrss-config.php index ec230b6..9580c08 100644 --- a/docker/ttrss-config.php +++ b/docker/ttrss-config.php @@ -90,6 +90,8 @@ // If set to true, users won't be able to set application language // and settings profile. + define ('LOGOUT_LOCATION', '/logout'); + // ********************* // *** Feed settings *** // ********************* @@ -197,5 +199,6 @@ // if necessary (after migrating all new options from this file). define('AUTHPROXY_WHITELIST_NAME', 'feedati-fe'); + //define('AUTHPROXY_WHITELIST_IP', '172.18.0.1'); // vim:ft=php bkc=yes: diff --git a/tt-rss b/tt-rss index d6ab5df..6b0ef3d 160000 --- a/tt-rss +++ b/tt-rss @@ -1 +1 @@ -Subproject commit d6ab5df482ebe96c849a1c0103d8c6e880699f38 +Subproject commit 6b0ef3d2112a19268810b381ece0a18b2050ee1f