diff --git a/data/templates/web/apache_default.stpl b/data/templates/web/apache_default.stpl index 82b7cfdd..a461b4c7 100755 --- a/data/templates/web/apache_default.stpl +++ b/data/templates/web/apache_default.stpl @@ -12,15 +12,10 @@ CustomLog /var/log/httpd/domains/%domain%.log combined %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log - AllowOverride AuthConfig FileInfo Indexes Limit + AllowOverride All SSLRequireSSL Options +Includes -Indexes %cgi_option% php_admin_value upload_tmp_dir %home%/%user%/tmp - 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 session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' @@ -28,12 +23,13 @@ AllowOverride All - php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + php_admin_value open_basedir none SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_crt% SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + RMode config RUidGid %user% %group% diff --git a/data/templates/web/apache_default.tpl b/data/templates/web/apache_default.tpl index 4f972a4e..db2fa53b 100755 --- a/data/templates/web/apache_default.tpl +++ b/data/templates/web/apache_default.tpl @@ -12,14 +12,9 @@ CustomLog /var/log/httpd/domains/%domain%.log combined %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log - AllowOverride AuthConfig FileInfo Indexes Limit + AllowOverride All Options +Includes -Indexes %cgi_option% php_admin_value upload_tmp_dir %home%/%user%/tmp - 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 session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' @@ -27,7 +22,8 @@ AllowOverride All - php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + php_admin_value open_basedir none + RMode config RUidGid %user% %group% diff --git a/data/templates/web/apache_unlim.stpl b/data/templates/web/apache_hosting.stpl similarity index 77% rename from data/templates/web/apache_unlim.stpl rename to data/templates/web/apache_hosting.stpl index a461b4c7..82b7cfdd 100755 --- a/data/templates/web/apache_unlim.stpl +++ b/data/templates/web/apache_hosting.stpl @@ -12,10 +12,15 @@ CustomLog /var/log/httpd/domains/%domain%.log combined %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log - AllowOverride All + AllowOverride AuthConfig FileInfo Indexes Limit SSLRequireSSL Options +Includes -Indexes %cgi_option% php_admin_value upload_tmp_dir %home%/%user%/tmp + 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 session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' @@ -23,13 +28,12 @@ AllowOverride All - php_admin_value open_basedir none + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_crt% SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - RMode config RUidGid %user% %group% diff --git a/data/templates/web/apache_unlim.tpl b/data/templates/web/apache_hosting.tpl similarity index 74% rename from data/templates/web/apache_unlim.tpl rename to data/templates/web/apache_hosting.tpl index db2fa53b..4f972a4e 100755 --- a/data/templates/web/apache_unlim.tpl +++ b/data/templates/web/apache_hosting.tpl @@ -12,9 +12,14 @@ CustomLog /var/log/httpd/domains/%domain%.log combined %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log - AllowOverride All + AllowOverride AuthConfig FileInfo Indexes Limit Options +Includes -Indexes %cgi_option% php_admin_value upload_tmp_dir %home%/%user%/tmp + 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 session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' @@ -22,8 +27,7 @@ AllowOverride All - php_admin_value open_basedir none - + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp RMode config RUidGid %user% %group%