smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz12068-httpd24.patch

diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web
--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web   2022-08-01 14:09:46.850000000 -0400
+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web       2022-08-01 14:14:00.103000000 -0400
@@ -4,7 +4,7 @@
        ((${'zabbix-server'}{'WebAccess'} || 'local') ne 'disabled')){
 
 my $access = (${'zabbix-server'}{'WebAccess'} || 'local') eq 'public' ?
-        'all':"$localAccess $externalSSLAccess";
+        'all granted':"ip $localAccess $externalSSLAccess";
 
 my $tz = ${'TimeZone'} || 'Europe/Paris';
 
@@ -18,38 +18,25 @@
 <Directory "/usr/share/zabbix">
     SSLRequireSSL on
     Options FollowSymLinks
-
-<FilesMatch .php>
-       SetHandler "proxy:unix:/var/run/php-fpm/php74-zabbix-server.sock|fcgi://localhost"
-</FilesMatch>
-
-    #AddType application/x-httpd-php .php
-    #php_admin_value max_execution_time 600
-    #php_admin_value max_input_time 600
-    #php_admin_value memory_limit 256M
-    #php_admin_value date.timezone $tz
-    #php_admin_value post_max_size 32M
-    #php_admin_value always_populate_raw_post_data -1
     AllowOverride None
-    Order allow,deny
-    Allow from $access
+    #AddType application/x-httpd-php .php
+    <FilesMatch .php>
+       SetHandler "proxy:unix:/var/run/php-fpm/php74-zabbix-server.sock|fcgi://localhost"
+    </FilesMatch>
+    Require $access
 </Directory>
 
 <Directory "/usr/share/zabbix/include">
-    Order deny,allow
-    Deny from all
+    Require all denied
     <files *.php>
-        Order deny,allow
-        Deny from all
+        Require all denied
     </files>
 </Directory>
 
 <Directory "/usr/share/zabbix/include/classes">
-    Order deny,allow
-    Deny from all
+    Require all denied
     <files *.php>
-        Order deny,allow
-        Deny from all
+        Require all denied
     </files>
 </Directory>
 
1	jpp	1.1	diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web
2			--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2022-08-01 14:09:46.850000000 -0400
3			+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2022-08-01 14:14:00.103000000 -0400
4			@@ -4,7 +4,7 @@
5			((${'zabbix-server'}{'WebAccess'} \|\| 'local') ne 'disabled')){
6
7			my $access = (${'zabbix-server'}{'WebAccess'} \|\| 'local') eq 'public' ?
8			- 'all':"$localAccess $externalSSLAccess";
9			+ 'all granted':"ip $localAccess $externalSSLAccess";
10
11			my $tz = ${'TimeZone'} \|\| 'Europe/Paris';
12
13			@@ -18,38 +18,25 @@
14			<Directory "/usr/share/zabbix">
15			SSLRequireSSL on
16			Options FollowSymLinks
17			-
18			-<FilesMatch .php>
19			- SetHandler "proxy:unix:/var/run/php-fpm/php74-zabbix-server.sock\|fcgi://localhost"
20			-</FilesMatch>
21			-
22			- #AddType application/x-httpd-php .php
23			- #php_admin_value max_execution_time 600
24			- #php_admin_value max_input_time 600
25			- #php_admin_value memory_limit 256M
26			- #php_admin_value date.timezone $tz
27			- #php_admin_value post_max_size 32M
28			- #php_admin_value always_populate_raw_post_data -1
29			AllowOverride None
30			- Order allow,deny
31			- Allow from $access
32			+ #AddType application/x-httpd-php .php
33			+ <FilesMatch .php>
34			+ SetHandler "proxy:unix:/var/run/php-fpm/php74-zabbix-server.sock\|fcgi://localhost"
35			+ </FilesMatch>
36			+ Require $access
37			</Directory>
38
39			<Directory "/usr/share/zabbix/include">
40			- Order deny,allow
41			- Deny from all
42			+ Require all denied
43			<files *.php>
44			- Order deny,allow
45			- Deny from all
46			+ Require all denied
47			</files>
48			</Directory>
49
50			<Directory "/usr/share/zabbix/include/classes">
51			- Order deny,allow
52			- Deny from all
53			+ Require all denied
54			<files *.php>
55			- Order deny,allow
56			- Deny from all
57			+ Require all denied
58			</files>
59			</Directory>
60