From ba3cf0dc8b8cb4cd5ccc0d1c8e9d49f758ad5a39 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 06 Dec 2008 11:41:55 -0500
Subject: [PATCH] Fixed y bug in replication that affected the deletion of data records.
---
install/tpl/apache_ispconfig.vhost.master | 66 +++++++++++++++------------------
1 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index a6d2f45..d53dbad 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,46 +4,40 @@
# 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>
- <Location /php/php-fcgi>
- Options ExecCGI
- SetHandler fastcgi-script
- </Location>
+ ServerAdmin webmaster@localhost
+ DocumentRoot /usr/local/ispconfig/interface/web/
+
+ <IfModule mod_fastcgi.c>
+ 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
+ Order allow,deny
+ Allow from all
+ </Directory>
+ </IfModule>
+
+ <IfModule mod_php5.c>
+ AddType application/x-httpd-php .php
+ <Directory /usr/local/ispconfig/interface/web>
+ Options FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+ </IfModule>
+
+ # ErrorLog /var/log/apache2/error.log
+ # CustomLog /var/log/apache2/access.log combined
+ ServerSignature Off
- Action php-fastcgi /php/php-fcgi
-
- ScriptAlias /php/ /usr/local/ispconfig/interface/bin/
-
- <Directory "/usr/local/ispconfig/interface/bin/">
- AllowOverride None
- Options +ExecCGI -MultiViews -Indexes
- Order allow,deny
- Allow from all
- </Directory>
- </IfModule>
-
- <IfModule mod_php5.c>
- AddType application/x-httpd-php .php
- </IfModule>
-
- <Directory /usr/local/ispconfig/interface/web/>
- Options FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
- ErrorLog /var/log/apache2/error.log
- CustomLog /var/log/apache2/access.log combined
- ServerSignature Off
-
</VirtualHost>
###########################################
--
Gitblit v1.9.1