diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl index 0f665231..9632eeb2 100644 --- a/data/templates/apache_default.stpl +++ b/data/templates/apache_default.stpl @@ -25,16 +25,16 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - AllowOverride All php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp - SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_cert% SSLCertificateKeyFile %ssl_key% + Include %home%/%user%/conf/%domain%.shttpd.* + diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl index e468a3ef..074b0730 100644 --- a/data/templates/apache_default.tpl +++ b/data/templates/apache_default.tpl @@ -24,11 +24,11 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - AllowOverride All php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + Include %home%/%user%/conf/%domain%.httpd.* diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl index 27b83989..2a14c51a 100644 --- a/data/templates/apache_phpcgi.stpl +++ b/data/templates/apache_phpcgi.stpl @@ -25,16 +25,16 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - AllowOverride All php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp - SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_cert% SSLCertificateKeyFile %ssl_key% + Include %home%/%user%/conf/%domain%.shttpd.* + diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl index 153e1d46..048b6e19 100644 --- a/data/templates/apache_phpcgi.tpl +++ b/data/templates/apache_phpcgi.tpl @@ -21,10 +21,10 @@ AddHandler phpcgi-script .php - AllowOverride All + Include %home%/%user%/conf/%domain%.httpd.* diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl index 326ac228..2c1e9854 100644 --- a/data/templates/apache_unlim.stpl +++ b/data/templates/apache_unlim.stpl @@ -25,16 +25,16 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - AllowOverride All php_admin_value open_basedir none - SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_cert% SSLCertificateKeyFile %ssl_key% + Include %home%/%user%/conf/%domain%.shttpd.* + diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl index b08f254b..6417ad44 100644 --- a/data/templates/apache_unlim.tpl +++ b/data/templates/apache_unlim.tpl @@ -24,11 +24,11 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - AllowOverride All php_admin_value open_basedir none + Include %home%/%user%/conf/%domain%.httpd.*