From 04e09afcccbf4e7f3eafa540ea35ac22b38f5bc0 Mon Sep 17 00:00:00 2001
From: filip <filip@ispconfig3>
Date: Mon, 27 Sep 2010 07:31:33 -0400
Subject: [PATCH] Implemented new FAQ functionality in help module
---
install/tpl/apache_ispconfig.vhost.master | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index c86392c..d3fc9a8 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,47 +4,61 @@
# for the ISPConfig controlpanel
######################################################
-Listen {vhost_port}
+{vhost_port_listen} Listen {vhost_port}
NameVirtualHost *:{vhost_port}
<VirtualHost _default_:{vhost_port}>
ServerAdmin webmaster@localhost
- DocumentRoot /usr/local/ispconfig/interface/web/
- <IfModule mod_fastcgi.c>
+ <IfModule mod_fcgid.c>
+ DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
<Directory /var/www/ispconfig/>
Options Indexes FollowSymLinks MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
- FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/php-fcgi-starter .php
- AllowOverride None
+ FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
Order allow,deny
Allow from all
</Directory>
</IfModule>
<IfModule mod_php5.c>
+ DocumentRoot /usr/local/ispconfig/interface/web/
AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web>
Options FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
+ php_value magic_quotes_gpc 0
</Directory>
</IfModule>
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
ServerSignature Off
+
+ <IfModule mod_security2.c>
+ SecRuleEngine Off
+ </IfModule>
+
+ # SSL Configuration
+ {ssl_comment}SSLEngine On
+ {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
+ {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
</VirtualHost>
-###########################################
-# Logfile configuration for vlogger
-###########################################
+<Directory /var/www/php-cgi-scripts>
+ AllowOverride None
+ Order Deny,Allow
+ Deny from all
+</Directory>
-LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
-CustomLog "| /usr/sbin/vlogger -s access.log /var/log/ispconfig/httpd" combined_ispconfig
-
+<Directory /var/www/php-fcgi-scripts>
+ AllowOverride None
+ Order Deny,Allow
+ Deny from all
+</Directory>
--
Gitblit v1.9.1