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
--- 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
+++ 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
@@ -44,33 +44,32 @@
SSLRequireSSL
Options -Indexes
AllowOverride None
- order deny,allow
- deny from all
+
+ order deny,allow
+ deny from all
+ );
+ $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " allow from all": " allow from $localAccess $externalSSLAccess";
+ $OUT .= qq(
+ Satisfy all
+
+
+
+ );
+ $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " Require all granted": " Require ip $localAccess $externalSSLAccess";
+ $OUT .= qq(
+
+
);
-
-
- my $access = ($phpmyadmin{'access'} || 'private');
-
- if ("$access" eq "private")
- {
- $OUT .= "allow from $localAccess $externalSSLAccess";
- }
- elsif ("$access" eq "public")
- {
- $OUT .= "allow from all";
- }
# we do not want people to mess with this for the moment
my $version = '74';
$OUT .= qq(
- Satisfy all
AddType application/x-httpd-php .php
-
-
- SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost"
-
-SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
+
+ SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost"
+
+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
@@ -78,28 +77,48 @@
# phpMyAdmin upstream tarball
#
- Order Deny,Allow
- Deny from All
- Allow from None
+
+ Order Deny,Allow
+ Deny from All
+ Allow from None
+
+
+ Require all denied
+
- Order Deny,Allow
- Deny from All
- Allow from None
+
+ Order Deny,Allow
+ Deny from All
+ Allow from None
+
+
+ Require all denied
+
- Order Deny,Allow
- Deny from All
- Allow from None
+
+ Order Deny,Allow
+ Deny from All
+ Allow from None
+
+
+ Require all denied
+
- Order Deny,Allow
- Deny from All
- Allow from None
+
+ Order Deny,Allow
+ Deny from All
+ Allow from None
+
+
+ Require all denied
+
);
}