Browse Source

Fix PHPMyAdmin vhost for Apache and support PHP7+ configuration in HTTP only mode

Emmanuel Bouthenot 4 years ago
parent
commit
e4fced7602
1 changed files with 26 additions and 16 deletions
  1. 26 16
      roles/webserver/templates/apache2/pma_vhost.j2

+ 26 - 16
roles/webserver/templates/apache2/pma_vhost.j2

@@ -26,11 +26,19 @@
 
     Include /etc/phpmyadmin/apache.conf
 
-    <IfModule mod_php5.c>
-        php_admin_value max_execution_time 240
-        php_admin_value upload_max_filesize 128M
-        php_admin_value post_max_size 128M
-    </IfModule>
+    <Directory /usr/share/phpmyadmin>
+        <IfModule mod_php5.c>
+            php_admin_value max_execution_time 240
+            php_admin_value upload_max_filesize 128M
+            php_admin_value post_max_size 128M
+        </IfModule>
+
+        <IfModule php7_module>
+            php_admin_value max_execution_time 240
+            php_admin_value upload_max_filesize 128M
+            php_admin_value post_max_size 128M
+        </IfModule>
+    </Directory>
 
 {% if with_fpm|bool %}
     Include conf-available/fpm-pool.conf
@@ -66,17 +74,19 @@
 
     Include /etc/phpmyadmin/apache.conf
 
-    <IfModule mod_php5.c>
-        php_admin_value max_execution_time 240
-        php_admin_value upload_max_filesize 128M
-        php_admin_value post_max_size 128M
-    </IfModule>
-
-    <IfModule php7_module>
-        php_admin_value max_execution_time 240
-        php_admin_value upload_max_filesize 128M
-        php_admin_value post_max_size 128M
-    </IfModule>
+    <Directory /usr/share/phpmyadmin>
+        <IfModule mod_php5.c>
+            php_admin_value max_execution_time 240
+            php_admin_value upload_max_filesize 128M
+            php_admin_value post_max_size 128M
+        </IfModule>
+
+        <IfModule php7_module>
+            php_admin_value max_execution_time 240
+            php_admin_value upload_max_filesize 128M
+            php_admin_value post_max_size 128M
+        </IfModule>
+    </Directory>
 
 {% if with_fpm|bool %}
     Include conf-available/fpm-pool.conf