smeserver-dl/contribs10/smeserver-dl-0.2.3-24syntax-bz12042.patch

diff -urN smeserver-dl-0.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl smeserver-dl-0.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
--- smeserver-dl-0.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl    2022-07-21 16:05:14.594052821 +0300
+++ smeserver-dl-0.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl        2022-07-21 16:08:57.238908941 +0300
@@ -1,6 +1,6 @@
 {
 my $access = $dl{'access'} || 'private';
-my $allow = ($access eq 'public')?'all':"$localAccess $externalSSLAccess";
+my $allow = ($access eq 'public')?'all granted':"ip $localAccess $externalSSLAccess";
 my $authtype = $dl{'Authentication'} || 'http';
 my $alias = (($dl{'AliasOnPrimary'} || 'enabled') eq 'enabled') ?
     'Alias /dl /usr/share/dl' : '';
@@ -61,16 +61,14 @@
 <Directory  /usr/share/dl>
     AllowOverride Limit
 $php
-    order deny,allow
-    deny from all
-    allow from $allow
+    Require $allow
 $auth
 </Directory>
 <Directory /usr/share/dl/include>
-    Deny from all
+    Require all denied
 </Directory>
 <Directory /usr/share/dl/style/include>
-    Deny from all
+    Require all denied
 </Directory>
 END
 }
1	jpp	1.1	diff -urN smeserver-dl-0.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl smeserver-dl-0.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
2			--- smeserver-dl-0.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl 2022-07-21 16:05:14.594052821 +0300
3			+++ smeserver-dl-0.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl 2022-07-21 16:08:57.238908941 +0300
4			@@ -1,6 +1,6 @@
5			{
6			my $access = $dl{'access'} \|\| 'private';
7			-my $allow = ($access eq 'public')?'all':"$localAccess $externalSSLAccess";
8			+my $allow = ($access eq 'public')?'all granted':"ip $localAccess $externalSSLAccess";
9			my $authtype = $dl{'Authentication'} \|\| 'http';
10			my $alias = (($dl{'AliasOnPrimary'} \|\| 'enabled') eq 'enabled') ?
11			'Alias /dl /usr/share/dl' : '';
12			@@ -61,16 +61,14 @@
13			<Directory /usr/share/dl>
14			AllowOverride Limit
15			$php
16			- order deny,allow
17			- deny from all
18			- allow from $allow
19			+ Require $allow
20			$auth
21			</Directory>
22			<Directory /usr/share/dl/include>
23			- Deny from all
24			+ Require all denied
25			</Directory>
26			<Directory /usr/share/dl/style/include>
27			- Deny from all
28			+ Require all denied
29			</Directory>
30			END
31			}