From adb20393920ec40dce909bc312910b6c94847a42 Mon Sep 17 00:00:00 2001 From: Xavier Date: Wed, 25 Sep 2019 22:57:37 +0200 Subject: [PATCH] Propagate #1943 to manager --- _example/etc/manager-apache2.4.conf | 7 +++++-- _example/etc/manager-apache2.X.conf | 13 +++++++++++-- _example/etc/manager-apache2.conf | 13 +++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf index 6fe88e6ba..62841e33d 100644 --- a/_example/etc/manager-apache2.4.conf +++ b/_example/etc/manager-apache2.4.conf @@ -2,6 +2,9 @@ # Apache configuration for LemonLDAP::NG Manager #==================================================================== +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + # To insert LLNG user id in Apache logs, declare this format and use it in # CustomLog directive #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O %{Lm-Remote-Custom}o" llng @@ -34,10 +37,10 @@ # (configuration, sessions, notifications) as manager.html, sessions.html, # notifications.html and uncomment the 2 following lines: # DirectoryIndex manager.html - # RewriteCond "%{REQUEST_FILENAME}" "!\.html$" + # RewriteCond "%{REQUEST_URI}" "!\.html(?:/.*)?$" # REST URLs - RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|lib|javascript|favicon).*" + RewriteCond "%{REQUEST_URI}" "!^/(?:static|doc|lib|javascript|favicon).*" RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT] # 2) FastCGI engine diff --git a/_example/etc/manager-apache2.X.conf b/_example/etc/manager-apache2.X.conf index 7289f4f8b..614c311f7 100644 --- a/_example/etc/manager-apache2.X.conf +++ b/_example/etc/manager-apache2.X.conf @@ -17,6 +17,15 @@ #CustomLog __APACHELOGDIR__/manager.log llng #ErrorLog __APACHELOGDIR__/lm_err.log + # Uncomment this if you are running behind a reverse proxy and want + # LemonLDAP::NG to see the real IP address of the end user + # Adjust the settings to match the IP address of your reverse proxy + # and the header containing the original IP address + # + #RemoteIPHeader X-Forwarded-For + #RemoteIPInternalProxy 127.0.0.1 + + # FASTCGI CONFIGURATION # --------------------- @@ -28,10 +37,10 @@ # (configuration, sessions, notifications) as manager.html, sessions.html, # notifications.html and uncomment the 2 following lines: # DirectoryIndex manager.html - # RewriteCond "%{REQUEST_FILENAME}" "!\.html$" + # RewriteCond "%{REQUEST_URI}" "!\.html(?:/.*)?$" # REST URLs - RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|lib|javascript|favicon).*" + RewriteCond "%{REQUEST_URI}" "!^/(?:static|doc|lib|javascript|favicon).*" RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT] # 2) FastCGI engine diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf index b26859cef..540557cbc 100644 --- a/_example/etc/manager-apache2.conf +++ b/_example/etc/manager-apache2.conf @@ -17,6 +17,15 @@ #CustomLog __APACHELOGDIR__/manager.log llng #ErrorLog __APACHELOGDIR__/lm_err.log + # Uncomment this if you are running behind a reverse proxy and want + # LemonLDAP::NG to see the real IP address of the end user + # Adjust the settings to match the IP address of your reverse proxy + # and the header containing the original IP address + # + #RemoteIPHeader X-Forwarded-For + #RemoteIPInternalProxy 127.0.0.1 + + # FASTCGI CONFIGURATION # --------------------- @@ -28,10 +37,10 @@ # (configuration, sessions, notifications) as manager.html, sessions.html, # notifications.html and uncomment the 2 following lines: # DirectoryIndex manager.html - # RewriteCond "%{REQUEST_FILENAME}" "!\.html$" + # RewriteCond "%{REQUEST_URI}" "!\.html(?:/.*)?$" # REST URLs - RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|lib|javascript|favicon).*" + RewriteCond "%{REQUEST_URI}" "!^/(?:static|doc|lib|javascript|favicon).*" RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT] # 2) FastCGI engine