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 @@ -22,16 +20,27 @@ $alias -$php + $php SSLRequireSSL on - Order deny,allow - Deny from all - Allow from $allow - $auth +_EOF + + if ( $auth ) { + $OUT .= " $auth\n" . + " \n" . + " Require $allow\n" . + " Require valid-user\n" . + " \n"; + } else { + $OUT .= "Require $allow\n"; + } + + $OUT .=<<_EOF; + - deny from all + Require all denied + _EOF } else{