smeserver-tt-rss/contribs10/smeserver-tt-rss-0.5.0-bz12062-httpd24.patch

diff -urN smeserver-tt-rss-0.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss smeserver-tt-rss-0.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss
--- smeserver-tt-rss-0.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss    2021-05-12 19:13:49.000000000 +0400
+++ smeserver-tt-rss-0.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss        2022-06-30 19:56:43.612000000 +0400
@@ -3,13 +3,11 @@
 if ((${'tt-rss'}{'status'} || 'enabled') eq 'enabled'){
 
     my $alias = ((${'tt-rss'}{'AliasOnPrimary'} || 'enabled') eq 'enabled' ) ? 'Alias /tt-rss /usr/share/tt-rss':'';
-    my $allow = ((${'tt-rss'}{'access'} || 'private') eq 'public') ? 'all':"$localAccess $externalSSLAccess";
+    my $allow = ((${'tt-rss'}{'access'} || 'private') eq 'public') ? 'all granted':"ip $localAccess $externalSSLAccess";
     my $auth = ((${'tt-rss'}{'Authentication'} || 'http') eq 'http') ? "AuthName \"Tiny Tiny RSS\"\n" .
                     "    AuthType Basic\n" .
                     "    AuthBasicProvider external\n" .
-                    "    AuthExternal pwauth\n" .
-                    "    Require valid-user\n" : '';
-
+                    "    AuthExternal pwauth\n" : '';
   my $php =<<'_EOF';
     AddType application/x-httpd-php .php
     <FilesMatch \.php$>
@@ -22,16 +20,27 @@
 $alias
 
 <Directory /usr/share/tt-rss>
-$php
+    $php
     SSLRequireSSL on
-    Order deny,allow
-    Deny from all
-    Allow from $allow
-    $auth
+_EOF
+
+    if ( $auth ) {
+       $OUT .= "    $auth\n" .
+               "    <RequireAll>\n" .
+               "        Require $allow\n" .
+                "        Require valid-user\n" .
+               "    </RequireAll>\n";
+    } else {
+       $OUT .= "Require $allow\n";
+    }
+
+    $OUT .=<<_EOF;
 </Directory>
+
 <Directory /usr/share/tt-rss/schema>
-    deny from all
+    Require all denied
 </Directory>
+
 _EOF
 }
 else{
1	michel	1.1	diff -urN smeserver-tt-rss-0.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss smeserver-tt-rss-0.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss
2			--- smeserver-tt-rss-0.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss 2021-05-12 19:13:49.000000000 +0400
3			+++ smeserver-tt-rss-0.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90tt-rss 2022-06-30 19:56:43.612000000 +0400
4			@@ -3,13 +3,11 @@
5			if ((${'tt-rss'}{'status'} \|\| 'enabled') eq 'enabled'){
6
7			my $alias = ((${'tt-rss'}{'AliasOnPrimary'} \|\| 'enabled') eq 'enabled' ) ? 'Alias /tt-rss /usr/share/tt-rss':'';
8			- my $allow = ((${'tt-rss'}{'access'} \|\| 'private') eq 'public') ? 'all':"$localAccess $externalSSLAccess";
9			+ my $allow = ((${'tt-rss'}{'access'} \|\| 'private') eq 'public') ? 'all granted':"ip $localAccess $externalSSLAccess";
10			my $auth = ((${'tt-rss'}{'Authentication'} \|\| 'http') eq 'http') ? "AuthName \"Tiny Tiny RSS\"\n" .
11			" AuthType Basic\n" .
12			" AuthBasicProvider external\n" .
13			- " AuthExternal pwauth\n" .
14			- " Require valid-user\n" : '';
15			-
16			+ " AuthExternal pwauth\n" : '';
17			my $php =<<'_EOF';
18			AddType application/x-httpd-php .php
19			<FilesMatch \.php$>
20			@@ -22,16 +20,27 @@
21			$alias
22
23			<Directory /usr/share/tt-rss>
24			-$php
25			+ $php
26			SSLRequireSSL on
27			- Order deny,allow
28			- Deny from all
29			- Allow from $allow
30			- $auth
31			+_EOF
32			+
33			+ if ( $auth ) {
34			+ $OUT .= " $auth\n" .
35			+ " <RequireAll>\n" .
36			+ " Require $allow\n" .
37			+ " Require valid-user\n" .
38			+ " </RequireAll>\n";
39			+ } else {
40			+ $OUT .= "Require $allow\n";
41			+ }
42			+
43			+ $OUT .=<<_EOF;
44			</Directory>
45			+
46			<Directory /usr/share/tt-rss/schema>
47			- deny from all
48			+ Require all denied
49			</Directory>
50			+
51			_EOF
52			}
53			else{