Skip to content

Commit 29478d3

Browse files
author
thom
committed
Add changes from install/tpl
1 parent 54d11f0 commit 29478d3

File tree

1 file changed

+84
-58
lines changed

1 file changed

+84
-58
lines changed

‎server/conf/apache_ispconfig.conf.master‎

Lines changed: 84 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
1515

1616
<Directory /var/www/clients>
1717
AllowOverride None
18-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
19-
Require all denied
20-
<tmpl_else>
21-
Order Deny,Allow
22-
Deny from all
23-
</tmpl_if>
18+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
19+
Require all denied
20+
<tmpl_else>
21+
Order Deny,Allow
22+
Deny from all
23+
</tmpl_if>
2424
</Directory>
2525

2626
# Do not allow access to the root file system of the server for security reasons
2727
<Directory />
28-
Options -Indexes
28+
Options -Indexes
2929
AllowOverride None
30-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
31-
Require all denied
32-
<tmpl_else>
33-
Order Deny,Allow
34-
Deny from all
35-
</tmpl_if>
30+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
31+
Require all denied
32+
<tmpl_else>
33+
Order Deny,Allow
34+
Deny from all
35+
</tmpl_if>
3636
</Directory>
3737

3838
<Directory /var/www>
@@ -41,107 +41,133 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
4141

4242
<Directory /var/www/conf>
4343
AllowOverride None
44-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
45-
Require all denied
46-
<tmpl_else>
47-
Order Deny,Allow
48-
Deny from all
49-
</tmpl_if>
44+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
45+
Require all denied
46+
<tmpl_else>
47+
Order Deny,Allow
48+
Deny from all
49+
</tmpl_if>
5050
</Directory>
5151

5252
# Except of the following directories that contain website scripts
5353
<Directory /usr/share/phpmyadmin>
54-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
55-
Require all granted
56-
<tmpl_else>
54+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
55+
Require all granted
56+
<tmpl_else>
5757
Order allow,deny
5858
Allow from all
59-
</tmpl_if>
59+
</tmpl_if>
6060
</Directory>
6161

6262
<Directory /usr/share/phpMyAdmin>
63-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
64-
Require all granted
65-
<tmpl_else>
63+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
64+
Require all granted
65+
<tmpl_else>
6666
Order allow,deny
6767
Allow from all
68-
</tmpl_if>
68+
</tmpl_if>
6969
</Directory>
7070

7171
<Directory /srv/www/htdocs>
72-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
73-
Require all granted
74-
<tmpl_else>
72+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
73+
Require all granted
74+
<tmpl_else>
7575
Order allow,deny
7676
Allow from all
77-
</tmpl_if>
77+
</tmpl_if>
7878
</Directory>
7979

8080
<Directory /usr/share/squirrelmail>
81-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
82-
Require all granted
83-
<tmpl_else>
81+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
82+
Require all granted
83+
<tmpl_else>
8484
Order allow,deny
8585
Allow from all
86-
</tmpl_if>
86+
</tmpl_if>
8787
</Directory>
8888

8989
# Allow access to mailman on OpenSuSE
9090
<Directory /usr/lib/mailman/cgi-bin>
91-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
92-
Require all granted
93-
<tmpl_else>
91+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
92+
Require all granted
93+
<tmpl_else>
9494
Order allow,deny
9595
Allow from all
96-
</tmpl_if>
96+
</tmpl_if>
9797
</Directory>
9898

9999
<Directory /usr/lib/mailman/icons>
100-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
101-
Require all granted
102-
<tmpl_else>
100+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
101+
Require all granted
102+
<tmpl_else>
103103
Order allow,deny
104104
Allow from all
105-
</tmpl_if>
105+
</tmpl_if>
106106
</Directory>
107107

108108
<Directory /var/lib/mailman/archives/>
109109
Options +FollowSymLinks
110-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
111-
Require all granted
112-
<tmpl_else>
110+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
111+
Require all granted
112+
<tmpl_else>
113113
Order allow,deny
114114
Allow from all
115-
</tmpl_if>
115+
</tmpl_if>
116116
</Directory>
117117

118118
# allow path to awstats and alias for awstats icons
119119
<Directory /usr/share/awstats>
120-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
121-
Require all granted
122-
<tmpl_else>
120+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
121+
Require all granted
122+
<tmpl_else>
123123
Order allow,deny
124124
Allow from all
125-
</tmpl_if>
125+
</tmpl_if>
126126
</Directory>
127127

128128
Alias /awstats-icon "/usr/share/awstats/icon"
129129

130130
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
131131
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
132-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
133-
Require all granted
134-
<tmpl_else>
132+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
133+
Require all granted
134+
<tmpl_else>
135135
Order allow,deny
136136
Allow from all
137-
</tmpl_if>
138-
<IfModule mpm_itk_module>
139-
AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
140-
</IfModule>
137+
</tmpl_if>
138+
<IfModule mpm_itk_module>
139+
AssignUserId www-data www-data
140+
</IfModule>
141141
</Directory>
142142

143143
NameVirtualHost *:80
144144
NameVirtualHost *:443
145145
<tmpl_loop name="ip_adresses">
146146
NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
147147
</tmpl_loop>
148+
149+
<tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>
150+
<IfModule mod_ssl.c>
151+
<tmpl_var name="ssl_comment">SSLStaplingCache shmcb:/var/run/ocsp(128000)
152+
</IfModule>
153+
</tmpl_if>
154+
155+
<Directory /var/www/php-cgi-scripts>
156+
AllowOverride None
157+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
158+
Require all denied
159+
<tmpl_else>
160+
Order Deny,Allow
161+
Deny from all
162+
</tmpl_if>
163+
</Directory>
164+
165+
<Directory /var/www/php-fcgi-scripts>
166+
AllowOverride None
167+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
168+
Require all denied
169+
<tmpl_else>
170+
Order Deny,Allow
171+
Deny from all
172+
</tmpl_if>
173+
</Directory>

0 commit comments

Comments
 (0)