Ernesto Nicolás Carrea 5 лет назад
Родитель
Сommit
84a7979e61
2 измененных файлов с 19 добавлено и 11 удалено
  1. 8 1
      install/deb/pma/apache.conf
  2. 11 10
      install/rhel/pma/apache.conf

+ 8 - 1
install/deb/pma/apache.conf

@@ -7,6 +7,13 @@ Alias /%pma_alias% /usr/share/phpmyadmin
 	DirectoryIndex index.php
 
 	<IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
+
+	<IfDefine PHP_ENABLED>
 		AddType application/x-httpd-php .php
 
 		php_flag magic_quotes_gpc Off
@@ -16,7 +23,7 @@ Alias /%pma_alias% /usr/share/phpmyadmin
 		php_value include_path .
 		php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
 		php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/
-	</IfModule>
+	</IfDefine>
 
 </Directory>
 

+ 11 - 10
install/rhel/pma/apache.conf

@@ -1,8 +1,8 @@
 # phpMyAdmin default Apache configuration
 
-Alias /phpmyadmin /usr/share/phpMyAdmin
+Alias /%pma_alias% /usr/share/phpmyadmin
 
-<Directory /usr/share/phpMyAdmin>
+<Directory /usr/share/phpmyadmin>
 	Options FollowSymLinks
 	DirectoryIndex index.php
 
@@ -12,6 +12,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
     <IfModule mod_php7.c>
         Define PHP_ENABLED
     </IfModule>
+
 	<IfDefine PHP_ENABLED>
 		AddType application/x-httpd-php .php
 
@@ -20,28 +21,28 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
 		php_flag register_globals Off
 		php_admin_flag allow_url_fopen Off
 		php_value include_path .
-		php_admin_value upload_tmp_dir /var/lib/phpMyAdmin/temp
-		php_admin_value open_basedir /usr/share/phpMyAdmin/:/etc/phpMyAdmin/:/var/lib/phpMyAdmin/:/usr/share/php/php-gettext:/usr/share/javascript/
+		php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
+		php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/
 	</IfDefine>
 
 </Directory>
 
 # Authorize for setup
-<Directory /usr/share/phpMyAdmin/setup>
+<Directory /usr/share/phpmyadmin/setup>
     <IfModule mod_authn_file.c>
-    AuthType Basic
-    AuthName "phpMyAdmin Setup"
-    AuthUserFile /etc/phpMyAdmin/htpasswd.setup
+		AuthType Basic
+		AuthName "phpMyAdmin Setup"
+		AuthUserFile /etc/phpmyadmin/htpasswd.setup
     </IfModule>
     Require valid-user
 </Directory>
 
 # Disallow web access to directories that don't need it
-<Directory /usr/share/phpMyAdmin/libraries>
+<Directory /usr/share/phpmyadmin/libraries>
     Order Deny,Allow
     Deny from All
 </Directory>
-<Directory /usr/share/phpMyAdmin/setup/lib>
+<Directory /usr/share/phpmyadmin/setup/lib>
     Order Deny,Allow
     Deny from All
 </Directory>