smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz12053-httpd24.patch

diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud
--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud      2022-07-07 23:56:11.218000000 -0400
+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud  2022-07-07 23:57:29.786000000 -0400
@@ -1,6 +1,6 @@
 {
 my $access = $nextcloud{'access'} || 'private';
-my $allow = ($access eq 'public')?'all':"$localAccess $externalSSLAccess";
+my $allow = ($access eq 'public')?'all granted':"ip $localAccess $externalSSLAccess";
 my $authtype = $nextcloud{'Authentication'} || 'none';
 
 my $alias = (($nextcloud{'AliasOnPrimary'} || 'enabled') eq 'enabled') ?
@@ -58,9 +58,7 @@
     Options +FollowSymLinks
     AllowOverride All
 $php
-    order deny,allow
-    deny from all
-    allow from $allow
+    Require $allow
 $auth
 
     <IfModule mod_dav.c>
@@ -74,7 +72,7 @@
 
   <Directory "/home/e-smith/files/nextcloud/data/">
     # just in case if .htaccess gets disabled
-    deny from all
+    Require all denied
   </Directory>
 _EOF
 
1	diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud
2	--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2022-07-07 23:56:11.218000000 -0400
3	+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2022-07-07 23:57:29.786000000 -0400
4	@@ -1,6 +1,6 @@
5	{
6	my $access = $nextcloud{'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 = $nextcloud{'Authentication'} \|\| 'none';
10
11	my $alias = (($nextcloud{'AliasOnPrimary'} \|\| 'enabled') eq 'enabled') ?
12	@@ -58,9 +58,7 @@
13	Options +FollowSymLinks
14	AllowOverride All
15	$php
16	- order deny,allow
17	- deny from all
18	- allow from $allow
19	+ Require $allow
20	$auth
21
22	<IfModule mod_dav.c>
23	@@ -74,7 +72,7 @@
24
25	<Directory "/home/e-smith/files/nextcloud/data/">
26	# just in case if .htaccess gets disabled
27	- deny from all
28	+ Require all denied
29	</Directory>
30	_EOF
31