| 1 |
jpp |
1.1 |
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 |
| 2 |
|
|
--- 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 |
| 3 |
|
|
+++ smeserver-mediawiki-1.38.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95mediawiki 2022-08-02 01:40:28.749000000 -0400 |
| 4 |
|
|
@@ -16,7 +16,6 @@ |
| 5 |
|
|
$OUT .= " SSLRequireSSL on"; |
| 6 |
|
|
} |
| 7 |
|
|
} |
| 8 |
|
|
- #AddType application/x-httpd-php .php .php3 .phtml |
| 9 |
|
|
{ |
| 10 |
|
|
|
| 11 |
|
|
my $version = '74'; |
| 12 |
|
|
@@ -36,14 +35,11 @@ |
| 13 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 14 |
|
|
if ($mwiki eq "local") |
| 15 |
|
|
{ |
| 16 |
|
|
- $OUT .= " deny from all\n"; |
| 17 |
|
|
- $OUT .= " allow from $localAccess"; |
| 18 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 19 |
|
|
} else { |
| 20 |
|
|
- $OUT .= " allow from all"; |
| 21 |
|
|
+ $OUT .= " Require all granted"; |
| 22 |
|
|
} |
| 23 |
|
|
} |
| 24 |
|
|
-# php_flag register_globals off |
| 25 |
|
|
-# php_admin_value open_basedir /opt/mediawiki/:/tmp/ |
| 26 |
|
|
</Directory> |
| 27 |
|
|
|
| 28 |
|
|
<Directory /opt/mediawiki/includes> |
| 29 |
|
|
@@ -52,10 +48,9 @@ |
| 30 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 31 |
|
|
if ($mwiki eq "local") |
| 32 |
|
|
{ |
| 33 |
|
|
- $OUT .= " deny from all\n"; |
| 34 |
|
|
- $OUT .= " allow from $localAccess"; |
| 35 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 36 |
|
|
} else { |
| 37 |
|
|
- $OUT .= " allow from all"; |
| 38 |
|
|
+ $OUT .= " Require all granted"; |
| 39 |
|
|
} |
| 40 |
|
|
} |
| 41 |
|
|
</Directory> |
| 42 |
|
|
@@ -66,10 +61,9 @@ |
| 43 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 44 |
|
|
if ($mwiki eq "local") |
| 45 |
|
|
{ |
| 46 |
|
|
- $OUT .= " deny from all\n"; |
| 47 |
|
|
- $OUT .= " allow from $localAccess"; |
| 48 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 49 |
|
|
} else { |
| 50 |
|
|
- $OUT .= " allow from all"; |
| 51 |
|
|
+ $OUT .= " Require all granted"; |
| 52 |
|
|
} |
| 53 |
|
|
} |
| 54 |
|
|
</Directory> |
| 55 |
|
|
@@ -80,10 +74,9 @@ |
| 56 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 57 |
|
|
if ($mwiki eq "local") |
| 58 |
|
|
{ |
| 59 |
|
|
- $OUT .= " deny from all\n"; |
| 60 |
|
|
- $OUT .= " allow from $localAccess"; |
| 61 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 62 |
|
|
} else { |
| 63 |
|
|
- $OUT .= " allow from all"; |
| 64 |
|
|
+ $OUT .= " Require all granted"; |
| 65 |
|
|
} |
| 66 |
|
|
} |
| 67 |
|
|
</Directory> |
| 68 |
|
|
@@ -94,10 +87,9 @@ |
| 69 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 70 |
|
|
if ($mwiki eq "local") |
| 71 |
|
|
{ |
| 72 |
|
|
- $OUT .= " deny from all\n"; |
| 73 |
|
|
- $OUT .= " allow from $localAccess"; |
| 74 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 75 |
|
|
} else { |
| 76 |
|
|
- $OUT .= " allow from all"; |
| 77 |
|
|
+ $OUT .= " Require all granted"; |
| 78 |
|
|
} |
| 79 |
|
|
} |
| 80 |
|
|
</Directory> |
| 81 |
|
|
@@ -108,10 +100,9 @@ |
| 82 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 83 |
|
|
if ($mwiki eq "local") |
| 84 |
|
|
{ |
| 85 |
|
|
- $OUT .= " deny from all\n"; |
| 86 |
|
|
- $OUT .= " allow from $localAccess"; |
| 87 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 88 |
|
|
} else { |
| 89 |
|
|
- $OUT .= " allow from all"; |
| 90 |
|
|
+ $OUT .= " Require all granted"; |
| 91 |
|
|
} |
| 92 |
|
|
} |
| 93 |
|
|
</Directory> |
| 94 |
|
|
@@ -122,10 +113,9 @@ |
| 95 |
|
|
my $mwiki = $mediawiki{'PublicAccess'} || "local"; |
| 96 |
|
|
if ($mwiki eq "local") |
| 97 |
|
|
{ |
| 98 |
|
|
- $OUT .= " deny from all\n"; |
| 99 |
|
|
- $OUT .= " allow from $localAccess"; |
| 100 |
|
|
+ $OUT .= " Require ip $localAccess"; |
| 101 |
|
|
} else { |
| 102 |
|
|
- $OUT .= " allow from all"; |
| 103 |
|
|
+ $OUT .= " Require all granted"; |
| 104 |
|
|
} |
| 105 |
|
|
} |
| 106 |
|
|
</Directory> |
Parent Directory
| 
Revision Log
| 
Revision Graph
