Skip to content

Commit 5099d3f

Browse files
author
Till Brehm
committed
Merge branch 'install/tpl_to_server/conf' into 'master'
 Install/tpl to server/conf copied **install/tpl/apache_apps.vhost.master** and **install/tpl/apache_ispconfig.conf.master** to **server/conf/** See merge request !540
2 parents 17335b1 + d170d81 commit 5099d3f

File tree

2 files changed

+69
-67
lines changed

2 files changed

+69
-67
lines changed

‎server/conf/apache_apps.vhost.master‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
######################################################
32
# This virtual host contains the configuration
43
# for the ISPConfig apps vhost
@@ -10,21 +9,15 @@
109
<VirtualHost {tmpl_var name='apps_vhost_ip'}:{tmpl_var name='apps_vhost_port'}>
1110
ServerAdmin webmaster@localhost
1211
{tmpl_var name='apps_vhost_servername'}
13-
12+
1413
<FilesMatch "\.ph(p3?|tml)$">
1514
SetHandler None
1615
</FilesMatch>
1716

1817
<IfModule mod_headers.c>
1918
RequestHeader unset Proxy early
2019
</IfModule>
21-
22-
{tmpl_if name="enable_spdy" op="==" value="y"}
23-
<IfModule spdy_module>
24-
SpdyEnabled on
25-
</IfModule>
26-
{/tmpl_if}
27-
20+
2821
<IfModule mod_php5.c>
2922
DocumentRoot {tmpl_var name='apps_vhost_dir'}
3023
AddType application/x-httpd-php .php
@@ -46,9 +39,9 @@
4639
<Directory {tmpl_var name='apps_vhost_dir'}>
4740
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
4841
AllowOverride AuthConfig Indexes Limit Options FileInfo
49-
<FilesMatch "\.php$">
50-
SetHandler fcgid-script
51-
</FilesMatch>
42+
<FilesMatch "\.php$">
43+
SetHandler fcgid-script
44+
</FilesMatch>
5245
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
5346
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
5447
Require all granted

‎server/conf/apache_ispconfig.conf.master‎

Lines changed: 64 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
################################################
2+
# ISPConfig General Apache Options
3+
################################################
4+
ServerTokens ProductOnly
5+
ServerSignature Off
6+
7+
18

29
################################################
310
# ISPConfig Logfile configuration for vlogger
@@ -10,110 +17,110 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
1017

1118
<Directory /var/www/clients>
1219
AllowOverride None
13-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
14-
Require all denied
15-
<tmpl_else>
16-
Order Deny,Allow
17-
Deny from all
18-
</tmpl_if>
20+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
21+
Require all denied
22+
<tmpl_else>
23+
Order Deny,Allow
24+
Deny from all
25+
</tmpl_if>
1926
</Directory>
2027

2128
# Do not allow access to the root file system of the server for security reasons
2229
<Directory />
23-
Options -Indexes
30+
Options -Indexes
2431
AllowOverride None
25-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
26-
Require all denied
27-
<tmpl_else>
28-
Order Deny,Allow
29-
Deny from all
30-
</tmpl_if>
32+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
33+
Require all denied
34+
<tmpl_else>
35+
Order Deny,Allow
36+
Deny from all
37+
</tmpl_if>
3138
</Directory>
3239

3340
<Directory /var/www/conf>
3441
AllowOverride None
35-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
36-
Require all denied
37-
<tmpl_else>
38-
Order Deny,Allow
39-
Deny from all
40-
</tmpl_if>
42+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
43+
Require all denied
44+
<tmpl_else>
45+
Order Deny,Allow
46+
Deny from all
47+
</tmpl_if>
4148
</Directory>
4249

4350
# Except of the following directories that contain website scripts
4451
<Directory /usr/share/phpmyadmin>
45-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
46-
Require all granted
47-
<tmpl_else>
52+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
53+
Require all granted
54+
<tmpl_else>
4855
Order allow,deny
4956
Allow from all
50-
</tmpl_if>
57+
</tmpl_if>
5158
</Directory>
5259

5360
<Directory /usr/share/phpMyAdmin>
54-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
55-
Require all granted
56-
<tmpl_else>
61+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
62+
Require all granted
63+
<tmpl_else>
5764
Order allow,deny
5865
Allow from all
59-
</tmpl_if>
66+
</tmpl_if>
6067
</Directory>
6168

6269
<Directory /srv/www/htdocs>
63-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
64-
Require all granted
65-
<tmpl_else>
70+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
71+
Require all granted
72+
<tmpl_else>
6673
Order allow,deny
6774
Allow from all
68-
</tmpl_if>
75+
</tmpl_if>
6976
</Directory>
7077

7178
<Directory /usr/share/squirrelmail>
72-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
73-
Require all granted
74-
<tmpl_else>
79+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
80+
Require all granted
81+
<tmpl_else>
7582
Order allow,deny
7683
Allow from all
77-
</tmpl_if>
84+
</tmpl_if>
7885
</Directory>
7986

8087
# Allow access to mailman on OpenSuSE
8188
<Directory /usr/lib/mailman/cgi-bin>
82-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
83-
Require all granted
84-
<tmpl_else>
89+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
90+
Require all granted
91+
<tmpl_else>
8592
Order allow,deny
8693
Allow from all
87-
</tmpl_if>
94+
</tmpl_if>
8895
</Directory>
8996

9097
<Directory /usr/lib/mailman/icons>
91-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
92-
Require all granted
93-
<tmpl_else>
98+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
99+
Require all granted
100+
<tmpl_else>
94101
Order allow,deny
95102
Allow from all
96-
</tmpl_if>
103+
</tmpl_if>
97104
</Directory>
98105

99106
<Directory /var/lib/mailman/archives/>
100107
Options +FollowSymLinks
101-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
102-
Require all granted
103-
<tmpl_else>
108+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
109+
Require all granted
110+
<tmpl_else>
104111
Order allow,deny
105112
Allow from all
106-
</tmpl_if>
113+
</tmpl_if>
107114
</Directory>
108115

109116
# allow path to awstats and alias for awstats icons
110117
<Directory /usr/share/awstats>
111-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
112-
Require all granted
113-
<tmpl_else>
118+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
119+
Require all granted
120+
<tmpl_else>
114121
Order allow,deny
115122
Allow from all
116-
</tmpl_if>
123+
</tmpl_if>
117124
</Directory>
118125

119126
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
@@ -122,16 +129,18 @@ Alias /awstats-icon "/usr/share/awstats/icon"
122129

123130
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
124131
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
125-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
126-
Require all granted
127-
<tmpl_else>
132+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
133+
Require all granted
134+
<tmpl_else>
128135
Order allow,deny
129136
Allow from all
130-
</tmpl_if>
137+
</tmpl_if>
131138
</Directory>
132139

140+
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
133141
NameVirtualHost *:80
134142
NameVirtualHost *:443
135143
<tmpl_loop name="ip_adresses">
136144
NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
137145
</tmpl_loop>
146+
</tmpl_if>

0 commit comments

Comments
 (0)