Skip to content

Commit 6fe5bbc

Browse files
author
Marius Cramer
committed
Merge branch 'apache24-fixes' into 'master'
Apache 2.4 fixes The correct syntax is `Require all denied`, not `Require all deny`, see here: http://httpd.apache.org/docs/2.4/upgrading.html
2 parents e4bc4a9 + 61bf636 commit 6fe5bbc

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

install/tpl/apache_ispconfig.conf.master

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
99
<Directory /var/www/clients>
1010
AllowOverride None
1111
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
12-
Require all deny
12+
Require all denied
1313
<tmpl_else>
1414
Order Deny,Allow
1515
Deny from all
@@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
2020
<Directory />
2121
AllowOverride None
2222
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
23-
Require all deny
23+
Require all denied
2424
<tmpl_else>
2525
Order Deny,Allow
2626
Deny from all
@@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
3030
<Directory /var/www/conf>
3131
AllowOverride None
3232
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
33-
Require all deny
33+
Require all denied
3434
<tmpl_else>
3535
Order Deny,Allow
3636
Deny from all

server/conf/apache_ispconfig.conf.master

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
99
<Directory /var/www/clients>
1010
AllowOverride None
1111
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
12-
Require all deny
12+
Require all denied
1313
<tmpl_else>
1414
Order Deny,Allow
1515
Deny from all
@@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
2020
<Directory />
2121
AllowOverride None
2222
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
23-
Require all deny
23+
Require all denied
2424
<tmpl_else>
2525
Order Deny,Allow
2626
Deny from all
@@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
3030
<Directory /var/www/conf>
3131
AllowOverride None
3232
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
33-
Require all deny
33+
Require all denied
3434
<tmpl_else>
3535
Order Deny,Allow
3636
Deny from all

server/conf/vhost.conf.master

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
33
AllowOverride None
44
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
5-
Require all deny
5+
Require all denied
66
<tmpl_else>
77
Order Deny,Allow
88
Deny from all
@@ -351,4 +351,4 @@
351351

352352
<tmpl_var name='apache_directives'>
353353
</VirtualHost>
354-
</tmpl_loop>
354+
</tmpl_loop>

0 commit comments

Comments
 (0)