From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.

---
 install/sql/incremental/upd_0032.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0032.sql b/install/sql/incremental/upd_0032.sql
index 02e2178..d4a080d 100644
--- a/install/sql/incremental/upd_0032.sql
+++ b/install/sql/incremental/upd_0032.sql
@@ -1,2 +1,2 @@
-ALTER TABLE `web_domain` ADD `pm` ENUM( 'static', 'dynamic', 'ondemand' ) NOT NULL DEFAULT 'dynamic' AFTER `php_fpm_use_socket`;
+ALTER TABLE `web_domain` ADD `pm` ENUM( 'static', 'dynamic', 'ondemand' ) NOT NULL DEFAULT 'dynamic' AFTER `php_fpm_use_socket`;
 ALTER TABLE `web_domain` ADD `pm_process_idle_timeout` INT NOT NULL DEFAULT '10' AFTER `pm_max_spare_servers` , ADD `pm_max_requests` INT NOT NULL DEFAULT '0' AFTER `pm_process_idle_timeout`;
\ No newline at end of file

--
Gitblit v1.9.1