diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl index 2a14c51a8..3df011134 100644 --- a/data/templates/apache_default.stpl +++ b/data/templates/apache_default.stpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl index 074b07303..312a03ab9 100644 --- a/data/templates/apache_default.tpl +++ b/data/templates/apache_default.tpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/apache_phpcgi.sh b/data/templates/apache_phpcgi.sh index d4b9c92b9..006cc7cde 100755 --- a/data/templates/apache_phpcgi.sh +++ b/data/templates/apache_phpcgi.sh @@ -5,7 +5,6 @@ domain="$2" ip="$3" home_dir="$4" docroot="$5" -port="$6" wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' wrapper_file="$home_dir/$user/domains/$domain/cgi-bin/php" diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl index 2a14c51a8..3df011134 100644 --- a/data/templates/apache_phpcgi.stpl +++ b/data/templates/apache_phpcgi.stpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl index 048b6e19b..2480bbdca 100644 --- a/data/templates/apache_phpcgi.tpl +++ b/data/templates/apache_phpcgi.tpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl index 2c1e9854c..de517aae8 100644 --- a/data/templates/apache_unlim.stpl +++ b/data/templates/apache_unlim.stpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl index 6417ad443..c668ec6fd 100644 --- a/data/templates/apache_unlim.tpl +++ b/data/templates/apache_unlim.tpl @@ -1,4 +1,4 @@ - + ServerName %domain_idn% ServerAlias %alias_idn% diff --git a/data/templates/ngingx_vhost_default.tpl b/data/templates/ngingx_vhost_default.tpl index 5a989e9ea..40fcb442b 100644 --- a/data/templates/ngingx_vhost_default.tpl +++ b/data/templates/ngingx_vhost_default.tpl @@ -1,11 +1,11 @@ server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias%; + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; server_name_in_redirect off; #error_log /var/log/httpd/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%port%; + proxy_pass http://%ip%:%web_ssl_port%; location ~* ^.+\.(%extentions%)$ { root %docroot%; @@ -22,7 +22,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%port%; + proxy_pass http://%ip%:%web_ssl_port%; } location ~ /\.ht {deny all;} diff --git a/func/domain_func.sh b/func/domain_func.sh index 1f989a49a..040ba96e6 100644 --- a/func/domain_func.sh +++ b/func/domain_func.sh @@ -223,7 +223,10 @@ httpd_add_config() { # Adding template to config cat $tpl_file | \ sed -e "s/%ip%/$ip/g" \ - -e "s/%port%/$port/g" \ + -e "s/%web_port%/$web_port/g" \ + -e "s/%web_ssl_port%/$web_ssl_port/g" \ + -e "s/%proxy_port%/$proxy_port/g" \ + -e "s/%proxy_ssl_port%/$proxy_ssl_port/g" \ -e "s/%domain_idn%/$domain_idn/g" \ -e "s/%domain%/$domain/g" \ -e "s/%user%/$user/g" \