Skip to content

Commit e2d45a4

Browse files
committed
updated patch files
1 parent ac7db90 commit e2d45a4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

support/0008-naemon-httpd.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
- <Location /thruk>
6161
+ <Location @HTMLURL@>
62-
Options ExecCGI
62+
Options ExecCGI FollowSymLinks
6363
- AuthName "Thruk Monitoring"
6464
+ AuthName "Naemon Monitoring"
6565
AuthType Basic

support/apache_fcgid.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Alias /thruk /usr/share/thruk/root/thruk
4848

4949
<Location /thruk>
50-
Options ExecCGI
50+
Options ExecCGI FollowSymLinks
5151
AuthName "Thruk Monitoring"
5252
AuthType Basic
5353
AuthUserFile /etc/thruk/htpasswd

support/thruk_cookie_auth.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
</IfModule>
55

66
# put everything else inside your vhost
7-
RewriteMap users prg:/usr/lib/thruk/thruk_auth
7+
RewriteMap thruk_users prg:/usr/lib/thruk/thruk_auth
88
RewriteCond %{REQUEST_URI} !^/thruk/cgi-bin/restricted.cgi
99
RewriteCond %{REQUEST_URI} ^/thruk # limit thruk cookie auth to thruk itself in standalone mode
1010
RewriteCond %{HTTP_COOKIE} (thruk_auth=[^;]+|$) [NC]
1111
RewriteRule ^/(.*)$ /%1/%{REMOTE_ADDR}/____/$1/____/%{QUERY_STRING} [C,NS]
12-
RewriteRule ^(.*)$ ${users:$1|/loginbad/} [C,NS]
12+
RewriteRule ^(.*)$ ${thruk_users:$1|/loginbad/} [C,NS]
1313
RewriteRule ^/pass/(.*)$ /$1 [NS,PT,L,E=!REMOTE_USER]
1414
RewriteRule ^/redirect/(.*)$ /$1 [NS,L,R=302]
1515
RewriteRule ^/loginok/([^/]+)/(.*)$ /$2 [NS,PT,L,E=REMOTE_USER:$1]

0 commit comments

Comments
 (0)