diff -Nur --no-dereference smeserver-mediawiki-1.38.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95mediawiki smeserver-mediawiki-1.38.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95mediawiki --- smeserver-mediawiki-1.38.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95mediawiki 2022-05-31 12:16:02.000000000 -0400 +++ smeserver-mediawiki-1.38.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95mediawiki 2022-08-02 01:40:28.749000000 -0400 @@ -16,7 +16,6 @@ $OUT .= " SSLRequireSSL on"; } } - #AddType application/x-httpd-php .php .php3 .phtml { my $version = '74'; @@ -36,14 +35,11 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } -# php_flag register_globals off -# php_admin_value open_basedir /opt/mediawiki/:/tmp/ @@ -52,10 +48,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } @@ -66,10 +61,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } @@ -80,10 +74,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } @@ -94,10 +87,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } @@ -108,10 +100,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } } @@ -122,10 +113,9 @@ my $mwiki = $mediawiki{'PublicAccess'} || "local"; if ($mwiki eq "local") { - $OUT .= " deny from all\n"; - $OUT .= " allow from $localAccess"; + $OUT .= " Require ip $localAccess"; } else { - $OUT .= " allow from all"; + $OUT .= " Require all granted"; } }