Skip to content

Commit 780641b

Browse files
serghey-rodinserghey-rodin
committed
updated templates and packages
1 parent fd3a3e2 commit 780641b

File tree

10 files changed

+98
-12
lines changed

10 files changed

+98
-12
lines changed

‎install/0.9.8/rhel/packages/default.pkg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
TEMPLATE='default'
1+
WEB_TEMPLATE='default'
2+
PROXY_TEMPLATE='default'
3+
DNS_TEMPLATE='default'
24
WEB_DOMAINS='100'
35
WEB_ALIASES='100'
46
DNS_DOMAINS='100'

‎install/0.9.8/rhel/packages/gainsboro.pkg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
TEMPLATE='default'
1+
WEB_TEMPLATE='default'
2+
PROXY_TEMPLATE='default'
3+
DNS_TEMPLATE='default'
24
WEB_DOMAINS='10'
35
WEB_ALIASES='10'
46
DNS_DOMAINS='10'

‎install/0.9.8/rhel/packages/palegreen.pkg‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
TEMPLATE='hosting'
1+
WEB_TEMPLATE='hosting'
2+
PROXY_TEMPLATE='hosting'
3+
DNS_TEMPLATE='default'
24
WEB_DOMAINS='50'
35
WEB_ALIASES='50'
46
DNS_DOMAINS='50'
@@ -12,5 +14,5 @@ BANDWIDTH='50000'
1214
NS='ns1.localhost.ltd,ns2.localhost.ltd'
1315
SHELL='nologin'
1416
BACKUPS='5'
15-
TIME='11:31:31'
16-
DATE='2012-07-26'
17+
TIME='07:49:47'
18+
DATE='2013-06-10'

‎install/0.9.8/rhel/packages/slategrey.pkg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
TEMPLATE='default'
1+
WEB_TEMPLATE='default'
2+
PROXY_TEMPLATE='default'
3+
DNS_TEMPLATE='default'
24
WEB_DOMAINS='100'
35
WEB_ALIASES='100'
46
DNS_DOMAINS='100'

‎install/0.9.8/rhel/templates/web/nginx/caching.stpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@ server {
4040
location ~ /\.hg/ {return 404;}
4141
location ~ /\.bzr/ {return 404;}
4242

43-
disable_symlinks if_not_owner from=%home%/%user%;
44-
4543
include %home%/%user%/conf/nginx.%domain%.conf*;
4644
}

‎install/0.9.8/rhel/templates/web/nginx/caching.tpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,5 @@ server {
3737
location ~ /\.hg/ {return 404;}
3838
location ~ /\.bzr/ {return 404;}
3939

40-
disable_symlinks if_not_owner from=%home%/%user%;
41-
4240
include %home%/%user%/conf/nginx.%domain%.conf*;
4341
}

‎install/0.9.8/rhel/templates/web/nginx/default.tpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ server {
2828
location ~ /\.hg/ {return 404;}
2929
location ~ /\.bzr/ {return 404;}
3030

31-
disable_symlinks if_not_owner from=%docroot%;
32-
3331
include %home%/%user%/conf/web/nginx.%domain%.conf*;
3432
}
3533

‎install/0.9.8/rhel/templates/web/nginx/hosting.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
# Changing public_html permission
3+
user="$1"
4+
domain="$2"
5+
ip="$3"
6+
home_dir="$4"
7+
docroot="$5"
8+
9+
chmod 755 $docroot
10+
11+
exit 0

‎install/0.9.8/rhel/templates/web/nginx/hosting.stpl‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
server {
2+
listen %ip%:%proxy_ssl_port%;
3+
server_name %domain_idn% %alias_idn%;
4+
ssl on;
5+
ssl_certificate %ssl_pem%;
6+
ssl_certificate_key %ssl_key%;
7+
error_log /var/log/httpd/domains/%domain%.error.log error;
8+
9+
location / {
10+
proxy_pass https://%ip%:%web_ssl_port%;
11+
location ~* ^.+\.(%proxy_extentions%)$ {
12+
root %sdocroot%;
13+
access_log /var/log/httpd/domains/%domain%.log combined;
14+
access_log /var/log/httpd/domains/%domain%.bytes bytes;
15+
expires max;
16+
try_files $uri @fallback;
17+
}
18+
}
19+
20+
location /error/ {
21+
alias %home%/%user%/web/%domain%/document_errors/;
22+
}
23+
24+
location @fallback {
25+
proxy_pass https://%ip%:%web_ssl_port%;
26+
}
27+
28+
location ~ /\.ht {return 404;}
29+
location ~ /\.svn/ {return 404;}
30+
location ~ /\.git/ {return 404;}
31+
location ~ /\.hg/ {return 404;}
32+
location ~ /\.bzr/ {return 404;}
33+
34+
disable_symlinks if_not_owner from=%docroot%;
35+
36+
include %home%/%user%/conf/web/snginx.%domain%.conf*;
37+
}
38+

‎install/0.9.8/rhel/templates/web/nginx/hosting.tpl‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
server {
2+
listen %ip%:%proxy_port%;
3+
server_name %domain_idn% %alias_idn%;
4+
error_log /var/log/httpd/domains/%domain%.error.log error;
5+
6+
location / {
7+
proxy_pass http://%ip%:%web_port%;
8+
location ~* ^.+\.(%proxy_extentions%)$ {
9+
root %docroot%;
10+
access_log /var/log/httpd/domains/%domain%.log combined;
11+
access_log /var/log/httpd/domains/%domain%.bytes bytes;
12+
expires max;
13+
try_files $uri @fallback;
14+
}
15+
}
16+
17+
location /error/ {
18+
alias %home%/%user%/web/%domain%/document_errors/;
19+
}
20+
21+
location @fallback {
22+
proxy_pass http://%ip%:%web_port%;
23+
}
24+
25+
location ~ /\.ht {return 404;}
26+
location ~ /\.svn/ {return 404;}
27+
location ~ /\.git/ {return 404;}
28+
location ~ /\.hg/ {return 404;}
29+
location ~ /\.bzr/ {return 404;}
30+
31+
disable_symlinks if_not_owner from=%docroot%;
32+
33+
include %home%/%user%/conf/web/nginx.%domain%.conf*;
34+
}
35+

0 commit comments

Comments
 (0)