Skip to content

Commit 27db86c

Browse files
author
Till Brehm
committed
Merge branch '6321-port-apps-vhost-from-install-to-server' into 'develop'
Resolve "Port apps.vhost from install/ to server/" Closes #6321 See merge request ispconfig/ispconfig3!1592
2 parents 23805c4 + d76a5f1 commit 27db86c

File tree

2 files changed

+10
-139
lines changed

2 files changed

+10
-139
lines changed

install/tpl/apache_apps.vhost.master

Lines changed: 0 additions & 134 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
server/conf/apache_apps.vhost.master

server/conf/apache_apps.vhost.master

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
<VirtualHost {tmpl_var name='apps_vhost_ip'}:{tmpl_var name='apps_vhost_port'}>
1010
ServerAdmin webmaster@localhost
1111
{tmpl_var name='apps_vhost_servername'}
12-
13-
<FilesMatch "\.ph(p3?|tml)$">
14-
SetHandler None
15-
</FilesMatch>
12+
13+
<Directory {tmpl_var name='apps_vhost_dir'}>
14+
<FilesMatch "\.ph(p3?|tml)$">
15+
SetHandler None
16+
</FilesMatch>
17+
</Directory>
1618

1719
# SSL Configuration
1820
<tmpl_var name="ssl_comment">SSLEngine On
@@ -96,7 +98,7 @@
9698
DocumentRoot {tmpl_var name='apps_vhost_dir'}
9799
SuexecUserGroup ispapps ispapps
98100
<Directory {tmpl_var name='apps_vhost_dir'}>
99-
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
101+
Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
100102
AllowOverride AuthConfig Indexes Limit Options FileInfo
101103
<FilesMatch "\.php$">
102104
SetHandler fcgid-script
@@ -109,6 +111,8 @@
109111
Allow from all
110112
</tmpl_if>
111113
</Directory>
114+
IPCCommTimeout 7200
115+
MaxRequestLen 15728640
112116
</IfModule>
113117

114118
{tmpl_if name="use_rspamd"}

0 commit comments

Comments
 (0)