github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

splited port variable to proxy and web

Browse source
This commit is contained in:
Serghey Rodin 2011-06-27 00:59:13 +03:00
commit 3bbce4c28a
9 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/templates/apache_default.stpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_ssl_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

2
data/templates/apache_default.tpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

1
data/templates/apache_phpcgi.sh
View file

@ -5,7 +5,6 @@ domain="$2"
ip="$3" ip="$3"
home_dir="$4" home_dir="$4"
docroot="$5" docroot="$5"
port="$6"
wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini'
wrapper_file="$home_dir/$user/domains/$domain/cgi-bin/php" wrapper_file="$home_dir/$user/domains/$domain/cgi-bin/php"

2
data/templates/apache_phpcgi.stpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_ssl_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

2
data/templates/apache_phpcgi.tpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

2
data/templates/apache_unlim.stpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_ssl_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

2
data/templates/apache_unlim.tpl
View file

@ -1,4 +1,4 @@
<VirtualHost %ip%:%port%> <VirtualHost %ip%:%web_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% ServerAlias %alias_idn%

8
data/templates/ngingx_vhost_default.tpl
View file

@ -1,11 +1,11 @@
server { server {
listen %ip%:%proxy_port%; listen %ip%:%proxy_ssl_port%;
server_name %domain_idn% %alias%; server_name %domain_idn% %alias_idn%;
server_name_in_redirect off; server_name_in_redirect off;
#error_log /var/log/httpd/domains/%domain%.error.log error; #error_log /var/log/httpd/domains/%domain%.error.log error;
location / { location / {
proxy_pass http://%ip%:%port%; proxy_pass http://%ip%:%web_ssl_port%;
location ~* ^.+\.(%extentions%)$ { location ~* ^.+\.(%extentions%)$ {
root %docroot%; root %docroot%;
@ -22,7 +22,7 @@ server {
} }
location @fallback { location @fallback {
proxy_pass http://%ip%:%port%; proxy_pass http://%ip%:%web_ssl_port%;
} }
location ~ /\.ht {deny all;} location ~ /\.ht {deny all;}

5
func/domain_func.sh
View file

@ -223,7 +223,10 @@ httpd_add_config() {
# Adding template to config # Adding template to config
cat $tpl_file | \ cat $tpl_file | \
sed -e "s/%ip%/$ip/g" \ 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_idn%/$domain_idn/g" \
-e "s/%domain%/$domain/g" \ -e "s/%domain%/$domain/g" \
-e "s/%user%/$user/g" \ -e "s/%user%/$user/g" \