smeserver-unjunkmgr/contribs10/smeserver-unjunkmgr-3.1-bz12063-24syntax.patch

diff -urN smeserver-unjunkmgr-3.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr smeserver-unjunkmgr-3.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr
--- smeserver-unjunkmgr-3.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr        2022-07-22 15:54:33.449191875 +0300
+++ smeserver-unjunkmgr-3.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr    2022-07-22 15:58:04.820139557 +0300
@@ -32,16 +32,13 @@
         $OUT .= "    Options +FollowSymLinks +ExecCGI\n";
         $OUT .= "    AllowOverride All\n";
         $OUT .= "    <FilesMatch \.php\$\>\n";
-        $OUT .= "        order deny,allow\n";
         $OUT .= "        SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n";
         $OUT .= "    </FilesMatch>\n";
-        $OUT .= "    order deny,allow\n";
-        $OUT .= "    deny from all\n";
 
         if (uc($local) eq 'YES') {
-          $OUT .= "    allow from $localAccess\n";
+          $OUT .= "    Require ip $localAccess\n";
         } else {
-          $OUT .= "    allow from all\n";
+          $OUT .= "    Require all granted\n";
         }
 
         $OUT .= "</Directory>\n";
1	diff -urN smeserver-unjunkmgr-3.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr smeserver-unjunkmgr-3.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr
2	--- smeserver-unjunkmgr-3.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr 2022-07-22 15:54:33.449191875 +0300
3	+++ smeserver-unjunkmgr-3.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98unjunkmgr 2022-07-22 15:58:04.820139557 +0300
4	@@ -32,16 +32,13 @@
5	$OUT .= " Options +FollowSymLinks +ExecCGI\n";
6	$OUT .= " AllowOverride All\n";
7	$OUT .= " <FilesMatch \.php\$\>\n";
8	- $OUT .= " order deny,allow\n";
9	$OUT .= " SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost\"\n";
10	$OUT .= " </FilesMatch>\n";
11	- $OUT .= " order deny,allow\n";
12	- $OUT .= " deny from all\n";
13
14	if (uc($local) eq 'YES') {
15	- $OUT .= " allow from $localAccess\n";
16	+ $OUT .= " Require ip $localAccess\n";
17	} else {
18	- $OUT .= " allow from all\n";
19	+ $OUT .= " Require all granted\n";
20	}
21
22	$OUT .= "</Directory>\n";