| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias |
| 2 |
|
|
--- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-23 23:59:14.647000000 -0400 |
| 3 |
|
|
+++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-24 00:11:03.606000000 -0400 |
| 4 |
|
|
@@ -44,33 +44,32 @@ |
| 5 |
|
|
SSLRequireSSL |
| 6 |
|
|
Options -Indexes |
| 7 |
|
|
AllowOverride None |
| 8 |
|
|
- order deny,allow |
| 9 |
|
|
- deny from all |
| 10 |
|
|
+ <IfModule mod_access_compat.c> |
| 11 |
|
|
+ order deny,allow |
| 12 |
|
|
+ deny from all |
| 13 |
|
|
+ ); |
| 14 |
|
|
+ $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " allow from all": " allow from $localAccess $externalSSLAccess"; |
| 15 |
|
|
+ $OUT .= qq( |
| 16 |
|
|
+ Satisfy all |
| 17 |
|
|
+ </IfModule> |
| 18 |
|
|
+ <IfModule !mod_access_compat.c> |
| 19 |
|
|
+ <RequireAll> |
| 20 |
|
|
+ ); |
| 21 |
|
|
+ $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " Require all granted": " Require ip $localAccess $externalSSLAccess"; |
| 22 |
|
|
+ $OUT .= qq( |
| 23 |
|
|
+ </RequireAll> |
| 24 |
|
|
+ </IfModule> |
| 25 |
|
|
); |
| 26 |
|
|
- |
| 27 |
|
|
- |
| 28 |
|
|
- my $access = ($phpmyadmin{'access'} || 'private'); |
| 29 |
|
|
- |
| 30 |
|
|
- if ("$access" eq "private") |
| 31 |
|
|
- { |
| 32 |
|
|
- $OUT .= "allow from $localAccess $externalSSLAccess"; |
| 33 |
|
|
- } |
| 34 |
|
|
- elsif ("$access" eq "public") |
| 35 |
|
|
- { |
| 36 |
|
|
- $OUT .= "allow from all"; |
| 37 |
|
|
- } |
| 38 |
|
|
|
| 39 |
|
|
# we do not want people to mess with this for the moment |
| 40 |
|
|
my $version = '74'; |
| 41 |
|
|
|
| 42 |
|
|
$OUT .= qq( |
| 43 |
|
|
- Satisfy all |
| 44 |
|
|
AddType application/x-httpd-php .php |
| 45 |
|
|
- |
| 46 |
|
|
-<FilesMatch .php\$\> |
| 47 |
|
|
- SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost" |
| 48 |
|
|
-</FilesMatch> |
| 49 |
|
|
-SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 |
| 50 |
|
|
+ <FilesMatch .php\$\> |
| 51 |
|
|
+ SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost" |
| 52 |
|
|
+ </FilesMatch> |
| 53 |
|
|
+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 |
| 54 |
|
|
</Directory> |
| 55 |
|
|
|
| 56 |
|
|
|
| 57 |
|
|
@@ -78,28 +77,48 @@ |
| 58 |
|
|
# phpMyAdmin upstream tarball |
| 59 |
|
|
# |
| 60 |
|
|
<Directory /usr/share/phpMyAdmin/setup/> |
| 61 |
|
|
- Order Deny,Allow |
| 62 |
|
|
- Deny from All |
| 63 |
|
|
- Allow from None |
| 64 |
|
|
+ <IfModule mod_access_compat.c> |
| 65 |
|
|
+ Order Deny,Allow |
| 66 |
|
|
+ Deny from All |
| 67 |
|
|
+ Allow from None |
| 68 |
|
|
+ </IfModule> |
| 69 |
|
|
+ <IfModule !mod_access_compat.c> |
| 70 |
|
|
+ Require all denied |
| 71 |
|
|
+ </IfModule> |
| 72 |
|
|
</Directory> |
| 73 |
|
|
|
| 74 |
|
|
|
| 75 |
|
|
<Directory /usr/share/phpMyAdmin/libraries/> |
| 76 |
|
|
- Order Deny,Allow |
| 77 |
|
|
- Deny from All |
| 78 |
|
|
- Allow from None |
| 79 |
|
|
+ <IfModule mod_access_compat.c> |
| 80 |
|
|
+ Order Deny,Allow |
| 81 |
|
|
+ Deny from All |
| 82 |
|
|
+ Allow from None |
| 83 |
|
|
+ </IfModule> |
| 84 |
|
|
+ <IfModule !mod_access_compat.c> |
| 85 |
|
|
+ Require all denied |
| 86 |
|
|
+ </IfModule> |
| 87 |
|
|
</Directory> |
| 88 |
|
|
|
| 89 |
|
|
<Directory /usr/share/phpMyAdmin/setup/lib/> |
| 90 |
|
|
- Order Deny,Allow |
| 91 |
|
|
- Deny from All |
| 92 |
|
|
- Allow from None |
| 93 |
|
|
+ <IfModule mod_access_compat.c> |
| 94 |
|
|
+ Order Deny,Allow |
| 95 |
|
|
+ Deny from All |
| 96 |
|
|
+ Allow from None |
| 97 |
|
|
+ </IfModule> |
| 98 |
|
|
+ <IfModule !mod_access_compat.c> |
| 99 |
|
|
+ Require all denied |
| 100 |
|
|
+ </IfModule> |
| 101 |
|
|
</Directory> |
| 102 |
|
|
|
| 103 |
|
|
<Directory /usr/share/phpMyAdmin/setup/frames/> |
| 104 |
|
|
- Order Deny,Allow |
| 105 |
|
|
- Deny from All |
| 106 |
|
|
- Allow from None |
| 107 |
|
|
+ <IfModule mod_access_compat.c> |
| 108 |
|
|
+ Order Deny,Allow |
| 109 |
|
|
+ Deny from All |
| 110 |
|
|
+ Allow from None |
| 111 |
|
|
+ </IfModule> |
| 112 |
|
|
+ <IfModule !mod_access_compat.c> |
| 113 |
|
|
+ Require all denied |
| 114 |
|
|
+ </IfModule> |
| 115 |
|
|
</Directory>); |
| 116 |
|
|
|
| 117 |
|
|
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
