Skip to content

Commit 008ada9

Browse files
author
redray
committed
1 parent 5b831f9 commit 008ada9

File tree

1 file changed

+91
-81
lines changed

1 file changed

+91
-81
lines changed

‎server/conf/vhost.conf.master‎

Lines changed: 91 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,86 @@
11

22
<VirtualHost <tmpl_var name='ip_address'>:80>
3-
<tmpl_if name='php' op='==' value='suphp'>
4-
DocumentRoot <tmpl_var name='web_document_root'>
5-
</tmpl_else>
6-
DocumentRoot <tmpl_var name='web_document_root_www'>
7-
</tmpl_if>
8-
9-
ServerName <tmpl_var name='domain'>
10-
ServerAdmin webmaster@<tmpl_var name='domain'>
11-
ErrorLog <tmpl_var name='document_root'>/log/error.log
12-
3+
<tmpl_if name='php' op='==' value='suphp'>
4+
DocumentRoot <tmpl_var name='web_document_root'>
5+
</tmpl_else>
6+
DocumentRoot <tmpl_var name='web_document_root_www'>
7+
</tmpl_if>
8+
9+
ServerName <tmpl_var name='domain'>
10+
<tmpl_if name='alias'>
11+
ServerAlias <tmpl_var name='alias'>
12+
</tmpl_if>
13+
ServerAdmin webmaster@<tmpl_var name='domain'>
14+
15+
ErrorLog <tmpl_var name='document_root'>/log/error.log
16+
17+
<tmpl_if name='errordocs' op='==' value='y'>
1318
ErrorDocument 400 /error/invalidSyntax.html
1419
ErrorDocument 401 /error/authorizationRequired.html
1520
ErrorDocument 403 /error/forbidden.html
1621
ErrorDocument 404 /error/fileNotFound.html
1722
ErrorDocument 405 /error/methodNotAllowed.html
1823
ErrorDocument 500 /error/internalServerError.html
1924
ErrorDocument 503 /error/overloaded.html
20-
21-
<Directory {tmpl_var name='web_document_root_www'}>
22-
Options None
23-
AllowOverride Indexes AuthConfig Limit FileInfo
24-
Order allow,deny
25-
Allow from all
26-
</Directory>
2725

28-
<tmpl_if name='alias'>
29-
ServerAlias <tmpl_var name='alias'>
30-
</tmpl_if>
26+
</tmpl_if>
27+
<Directory {tmpl_var name='web_document_root_www'}>
28+
Options None
29+
AllowOverride Indexes AuthConfig Limit FileInfo
30+
Order allow,deny
31+
Allow from all
32+
</Directory>
33+
3134
<tmpl_if name='cgi' op='==' value='y'>
32-
# cgi enabled
33-
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
34-
AddHandler cgi-script .cgi
35-
AddHandler cgi-script .pl
35+
# cgi enabled
36+
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
37+
AddHandler cgi-script .cgi
38+
AddHandler cgi-script .pl
3639
</tmpl_if>
3740
<tmpl_if name='ssi' op='==' value='y'>
38-
# ssi enabled
39-
AddType text/html .shtml
40-
AddOutputFilter INCLUDES .shtml
41+
# ssi enabled
42+
AddType text/html .shtml
43+
AddOutputFilter INCLUDES .shtml
4144
</tmpl_if>
4245
<tmpl_if name='suexec' op='==' value='y'>
43-
# suexec enabled
44-
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
46+
# suexec enabled
47+
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
4548
</tmpl_if>
4649
<tmpl_if name='php' op='==' value='mod'>
47-
# mod_php enabled
48-
AddType application/x-httpd-php .php .php3 .php4 .php5
50+
# mod_php enabled
51+
AddType application/x-httpd-php .php .php3 .php4 .php5
4952
</tmpl_if>
5053
<tmpl_if name='php' op='==' value='suphp'>
51-
<Directory {tmpl_var name='web_document_root'}>
52-
# suphp enabled
53-
suPHP_Engine on
54-
# suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
55-
AddHandler x-httpd-suphp .php .php3 .php4 .php5
56-
suPHP_AddHandler x-httpd-suphp
57-
</Directory>
54+
# suphp enabled
55+
<Directory {tmpl_var name='web_document_root'}>
56+
suPHP_Engine on
57+
# suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
58+
AddHandler x-httpd-suphp .php .php3 .php4 .php5
59+
suPHP_AddHandler x-httpd-suphp
60+
</Directory>
5861
</tmpl_if>
5962
<tmpl_if name='php' op='==' value='cgi'>
60-
# php as cgi enabled
61-
AddType application/x-httpd-php .php .php3 .php4 .php5
63+
# php as cgi enabled
64+
AddType application/x-httpd-php .php .php3 .php4 .php5
6265
</tmpl_if>
6366
<tmpl_if name='php' op='==' value='fast-cgi'>
64-
# php as fast-cgi enabled
65-
<Directory {tmpl_var name='web_document_root_www'}>
66-
AddHandler fcgid-script .php .php3 .php4 .php5
67-
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
68-
Options FollowSymLinks +ExecCGI Indexes
69-
AllowOverride None
70-
Order allow,deny
71-
Allow from all
72-
</Directory>
67+
# php as fast-cgi enabled
68+
<Directory {tmpl_var name='web_document_root_www'}>
69+
AddHandler fcgid-script .php .php3 .php4 .php5
70+
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
71+
Options FollowSymLinks +ExecCGI Indexes
72+
AllowOverride None
73+
Order allow,deny
74+
Allow from all
75+
</Directory>
7376
</tmpl_if>
7477
<tmpl_if name="rewrite_enabled">
75-
RewriteEngine on
78+
79+
RewriteEngine on
7680
<tmpl_loop name="redirects">
77-
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
78-
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
81+
82+
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
83+
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
7984
</tmpl_loop>
8085
</tmpl_if>
8186

@@ -93,65 +98,70 @@
9398
###########################################################
9499

95100
<VirtualHost <tmpl_var name='ip_address'>:443>
96-
DocumentRoot <tmpl_var name='web_document_root'>
97-
ServerName <tmpl_var name='domain'>
98-
ServerAdmin webmaster@<tmpl_var name='domain'>
99-
ErrorLog <tmpl_var name='document_root'>/log/error.log
101+
DocumentRoot <tmpl_var name='web_document_root'>
102+
ServerName <tmpl_var name='domain'>
103+
<tmpl_if name='alias'>
104+
ServerAlias <tmpl_var name='alias'>
105+
</tmpl_if>
106+
ServerAdmin webmaster@<tmpl_var name='domain'>
107+
108+
ErrorLog <tmpl_var name='document_root'>/log/error.log
100109

110+
<tmpl_if name='errordocs' op='==' value='y'>
101111
ErrorDocument 400 /error/invalidSyntax.html
102112
ErrorDocument 401 /error/authorizationRequired.html
103113
ErrorDocument 403 /error/forbidden.html
104114
ErrorDocument 404 /error/fileNotFound.html
105115
ErrorDocument 405 /error/methodNotAllowed.html
106116
ErrorDocument 500 /error/internalServerError.html
107117
ErrorDocument 503 /error/overloaded.html
108-
118+
119+
</tmpl_if>
109120
SSLEngine on
110121
SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.crt
111122
SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.key
112123
<tmpl_if name='has_bundle_cert'>
113124
SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
114125
</tmpl_if>
115126

116-
<tmpl_if name='alias'>
117-
ServerAlias <tmpl_var name='alias'>
118-
</tmpl_if>
119127
<tmpl_if name='cgi'>
120-
# cgi enabled
121-
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
122-
AddHandler cgi-script .cgi
123-
AddHandler cgi-script .pl
128+
# cgi enabled
129+
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
130+
AddHandler cgi-script .cgi
131+
AddHandler cgi-script .pl
124132
</tmpl_if>
125133
<tmpl_if name='ssi'>
126-
# ssi enabled
127-
AddType text/html .shtml
128-
AddOutputFilter INCLUDES .shtml
134+
# ssi enabled
135+
AddType text/html .shtml
136+
AddOutputFilter INCLUDES .shtml
129137
</tmpl_if>
130138
<tmpl_if name='suexec'>
131-
# suexec enabled
132-
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
139+
# suexec enabled
140+
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
133141
</tmpl_if>
134142
<tmpl_if name='php' op='==' value='mod'>
135-
# mod_php enabled
136-
AddType application/x-httpd-php .php .php3 .php4 .php5
143+
# mod_php enabled
144+
AddType application/x-httpd-php .php .php3 .php4 .php5
137145
</tmpl_if>
138146
<tmpl_if name='php' op='==' value='suphp'>
139-
# suphp enabled
140-
suPHP_Engine on
141-
suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
142-
AddHandler x-httpd-php .php .php3 .php4 .php5
143-
suPHP_AddHandler x-httpd-php
147+
# suphp enabled
148+
suPHP_Engine on
149+
suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
150+
AddHandler x-httpd-php .php .php3 .php4 .php5
151+
suPHP_AddHandler x-httpd-php
144152
</tmpl_if>
145153
<tmpl_if name='php' op='==' value='cgi'>
146-
# php as cgi enabled
147-
AddType application/x-httpd-php .php .php3 .php4 .php5
154+
# php as cgi enabled
155+
AddType application/x-httpd-php .php .php3 .php4 .php5
148156
</tmpl_if>
149157

150158
<tmpl_if name="rewrite_enabled">
151-
RewriteEngine on
159+
160+
RewriteEngine on
152161
<tmpl_loop name="redirects">
153-
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
154-
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
162+
163+
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
164+
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
155165
</tmpl_loop>
156166
</tmpl_if>
157167

0 commit comments

Comments
 (0)