diff --git a/docker-compose.yml b/docker-compose.yml index a7ef2a8..1a93dc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,6 +58,7 @@ services: container_name: feedati_webserver volumes: - ./docker/frontend-apache.conf:/usr/local/apache2/conf/httpd.conf:ro + - ./docker/frontend-apache/:/etc/apache2/:ro - ./docker/frontend-login/:/var/www/login/:ro ports: - 80:80 diff --git a/docker/frontend-apache.conf b/docker/frontend-apache.conf index b6c26c0..f8a7c81 100644 --- a/docker/frontend-apache.conf +++ b/docker/frontend-apache.conf @@ -10,7 +10,7 @@ LoadModule mime_module modules/mod_mime.so LoadModule log_config_module modules/mod_log_config.so LoadModule env_module modules/mod_env.so #LoadModule expires_module modules/mod_expires.so -#LoadModule headers_module modules/mod_headers.so +LoadModule headers_module modules/mod_headers.so #LoadModule setenvif_module modules/mod_setenvif.so #LoadModule remoteip_module modules/mod_remoteip.so LoadModule proxy_module modules/mod_proxy.so @@ -31,8 +31,7 @@ LoadModule authn_file_module modules/mod_authn_file.so # LoadModule authn_dbm_module modules/mod_authn_dbm.so LoadModule macro_module modules/mod_macro.so - -#LoadModule rewrite_module modules/mod_rewrite.so +LoadModule rewrite_module modules/mod_rewrite.so # @@ -101,7 +100,7 @@ ErrorLog /proc/self/fd/2 # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. -LogLevel warn +LogLevel trace1 # @@ -193,9 +192,11 @@ ProxyPreserveHost On ProxyPass http://tt-rss/tt-rss/ ProxyPassReverse http://tt-rss/tt-rss/ - Use Auth Require valid-user +RewriteEngine on +RewriteRule .* - [E=RU:%{LA-U:REMOTE_USER},NS] +RequestHeader set X-Forwarded-User %{RU}e diff --git a/docker/frontend-apache/passwords.txt b/docker/frontend-apache/passwords.txt new file mode 100644 index 0000000..1a1c6ad --- /dev/null +++ b/docker/frontend-apache/passwords.txt @@ -0,0 +1 @@ +admin:$2y$05$tPaBuT/mWQCvfk1C12PmV.0Dz8kt0cY1jcD53OGCN26Y8dX2kRPs. diff --git a/docker/ttrss-config.php b/docker/ttrss-config.php index 868270e..7b32ee6 100644 --- a/docker/ttrss-config.php +++ b/docker/ttrss-config.php @@ -175,7 +175,7 @@ // if you experience weird errors and tt-rss failing to start, blank pages // after login, or content encoding errors, disable it. - define('PLUGINS', 'auth_internal, note'); + define('PLUGINS', 'auth_proxy, note'); // Comma-separated list of plugins to load automatically for all users. // System plugins have to be specified here. Please enable at least one // authentication plugin here (auth_*). diff --git a/tt-rss b/tt-rss index c925f4e..7e1a483 160000 --- a/tt-rss +++ b/tt-rss @@ -1 +1 @@ -Subproject commit c925f4e3fdad04442c5c2f542883dbd26c81cc23 +Subproject commit 7e1a483db2644f8da14c5ea6072ed55fcd75bcba