PHP-less support

install/deb/templates/web/apache2/default.stpl

@@ -16,13 +16,23 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
+
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/deb/templates/web/apache2/default.tpl

@@ -19,12 +19,21 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
+
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/deb/templates/web/apache2/hosting.stpl

@@ -16,20 +16,29 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI
-        php_admin_value upload_max_filesize 10M
-        php_admin_value max_execution_time 20
-        php_admin_value post_max_size  8M
-        php_admin_value memory_limit 32M
-        php_admin_flag mysql.allow_persistent  off
-        php_admin_flag safe_mode off
-        php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value upload_max_filesize 10M
+            php_admin_value max_execution_time 20
+            php_admin_value post_max_size  8M
+            php_admin_value memory_limit 32M
+            php_admin_flag mysql.allow_persistent  off
+            php_admin_flag safe_mode off
+            php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/deb/templates/web/apache2/hosting.tpl

@@ -19,19 +19,27 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value upload_max_filesize 10M
-        php_admin_value max_execution_time 20
-        php_admin_value post_max_size  8M
-        php_admin_value memory_limit 32M
-        php_admin_flag mysql.allow_persistent  off
-        php_admin_flag safe_mode off
-        php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value upload_max_filesize 10M
+            php_admin_value max_execution_time 20
+            php_admin_value post_max_size  8M
+            php_admin_value memory_limit 32M
+            php_admin_flag mysql.allow_persistent  off
+            php_admin_flag safe_mode off
+            php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/deb/templates/web/apache2/phpcgi.stpl

@@ -16,17 +16,25 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        Action phpcgi-script /cgi-bin/php
-        <Files *.php>
-            SetHandler phpcgi-script
-        </Files>
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            Action phpcgi-script /cgi-bin/php
+            <Files *.php>
+                SetHandler phpcgi-script
+            </Files>
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/deb/templates/web/apache2/phpfcgid.stpl

@@ -16,22 +16,33 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            <Files *.php>
+            SetHandler fcgid-script
+            </Files>
+            FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir none
+    <IfDefine PHP_ENABLED>
+        php_admin_value open_basedir none
+    </IfDefine>
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_crt%

install/deb/templates/web/apache2/phpfcgid.tpl

@@ -19,16 +19,24 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            <Files *.php>
+            SetHandler fcgid-script
+            </Files>
+            FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/pma/apache.conf

@@ -7,6 +7,12 @@ Alias /phpmyadmin /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 +22,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
 		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/
-	</IfModule>
+	</IfDefine>
 
 </Directory>
 

install/rhel/templates/web/httpd/default.tpl

@@ -14,12 +14,21 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
+
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/templates/web/httpd/hosting.stpl

@@ -11,20 +11,29 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI
-        php_admin_value upload_max_filesize 10M
-        php_admin_value max_execution_time 20
-        php_admin_value post_max_size  8M
-        php_admin_value memory_limit 32M
-        php_admin_flag mysql.allow_persistent  off
-        php_admin_flag safe_mode off
-        php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value upload_max_filesize 10M
+            php_admin_value max_execution_time 20
+            php_admin_value post_max_size  8M
+            php_admin_value memory_limit 32M
+            php_admin_flag mysql.allow_persistent  off
+            php_admin_flag safe_mode off
+            php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/templates/web/httpd/hosting.tpl

@@ -14,19 +14,27 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value upload_max_filesize 10M
-        php_admin_value max_execution_time 20
-        php_admin_value post_max_size  8M
-        php_admin_value memory_limit 32M
-        php_admin_flag mysql.allow_persistent  off
-        php_admin_flag safe_mode off
-        php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
+        <IfDefine PHP_ENABLED>
+            php_admin_value upload_max_filesize 10M
+            php_admin_value max_execution_time 20
+            php_admin_value post_max_size  8M
+            php_admin_value memory_limit 32M
+            php_admin_flag mysql.allow_persistent  off
+            php_admin_flag safe_mode off
+            php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%"
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/templates/web/httpd/phpcgi.stpl

@@ -11,17 +11,26 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        Action phpcgi-script /cgi-bin/php
-        <Files *.php>
-            SetHandler phpcgi-script
-        </Files>
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            Action phpcgi-script /cgi-bin/php
+            <Files *.php>
+                SetHandler phpcgi-script
+            </Files>
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/templates/web/httpd/phpcgi.tpl

@@ -14,16 +14,24 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        Action phpcgi-script /cgi-bin/php
-        <Files *.php>
-            SetHandler phpcgi-script
-        </Files>
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            Action phpcgi-script /cgi-bin/php
+            <Files *.php>
+                SetHandler phpcgi-script
+            </Files>
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/rhel/templates/web/httpd/phpfcgid.stpl

@@ -11,22 +11,33 @@
     CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            <Files *.php>
+            SetHandler fcgid-script
+            </Files>
+            FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir none
+    <IfDefine PHP_ENABLED>
+        php_admin_value open_basedir none
+    </IfDefine>
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_crt%

install/rhel/templates/web/httpd/phpfcgid.tpl

@@ -14,16 +14,24 @@
         
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
+    <IfModule mod_php5.c>
+        Define PHP_ENABLED
+    </IfModule>
+    <IfModule mod_php7.c>
+        Define PHP_ENABLED
+    </IfModule>
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
-        php_admin_value open_basedir %docroot%:%home%/%user%/tmp
-        php_admin_value upload_tmp_dir %home%/%user%/tmp
-        php_admin_value session.save_path %home%/%user%/tmp
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        <IfDefine PHP_ENABLED>
+            php_admin_value open_basedir %docroot%:%home%/%user%/tmp
+            php_admin_value upload_tmp_dir %home%/%user%/tmp
+            php_admin_value session.save_path %home%/%user%/tmp
+            <Files *.php>
+            SetHandler fcgid-script
+            </Files>
+            FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        </IfDefine>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All