From 7e48bdf4e952f7b700e64e4cd8cb190bfc630ef9 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 31 Oct 2012 07:42:05 -0400
Subject: [PATCH] Fixed: Follow-up to commit r3623 - entered all missing german and english entries for datalog status - excluded some more tables from status display - inserted the info-display code to the relevant templates
---
install/tpl/apache_ispconfig.vhost.master | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index ac69175..4d59dfe 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,24 +4,66 @@
# for the ISPConfig controlpanel
######################################################
-Listen 8080
-NameVirtualHost *:8080
+{vhost_port_listen} Listen {vhost_port}
+NameVirtualHost *:{vhost_port}
-<VirtualHost _default_:8080>
- ServerAdmin webmaster@localhost
- DocumentRoot /usr/local/ispconfig/interface/web/
-
- <IfModule mod_php5.c>
- AddType application/x-httpd-php .php
- </IfModule>
-
- <Directory /usr/local/ispconfig/interface/web/>
- Options FollowSymLinks
- AllowOverride None
- </Directory>
-
- ErrorLog /var/log/apache2/error.log
- CustomLog /var/log/apache2/access.log combined
- ServerSignature Off
-
-</VirtualHost>
\ No newline at end of file
+<VirtualHost _default_:{vhost_port}>
+ ServerAdmin webmaster@localhost
+
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
+
+ <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
+ 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>
+# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+# 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>
+
+<Directory /var/www/php-cgi-scripts>
+ AllowOverride None
+ Order Deny,Allow
+ Deny from all
+</Directory>
+
+<Directory /var/www/php-fcgi-scripts>
+ AllowOverride None
+ Order Deny,Allow
+ Deny from all
+</Directory>
+
--
Gitblit v1.9.1