From cea1e5d3d0a7c45568a1539f9ecb6cf36c7f7f6c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 15 Aug 2012 05:43:27 -0400
Subject: [PATCH] Fixed: FS#2346 - doveadm request disabledoveadm column in mail_user table - Added missing sys_tpl table to ispconfig3.sql and moved the definition of the table to the upd_0035.sql file as new tables cant be added in existing update files. - added new ssl_key field to web_domain table. - cleaned up unused code from apache plugin.
---
install/sql/incremental/upd_0034.sql | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/install/sql/incremental/upd_0034.sql b/install/sql/incremental/upd_0034.sql
index 7e9d05f..58b53c7 100644
--- a/install/sql/incremental/upd_0034.sql
+++ b/install/sql/incremental/upd_0034.sql
@@ -54,7 +54,7 @@
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `aps_settings`
+-- Table structure for table `aps_settings`
--
CREATE TABLE IF NOT EXISTS `aps_settings` (
@@ -68,32 +68,6 @@
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `tpl_default`
---
-
-CREATE TABLE IF NOT EXISTS `tpl_default` (
- `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `username` varchar(64) NOT NULL,
- `logo_url` varchar(255) NOT NULL,
- PRIMARY KEY (`var_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
--- --------------------------------------------------------
-
---
--- Tabellenstruktur für Tabelle `tpl_default-v2`
---
-
-CREATE TABLE IF NOT EXISTS `tpl_default-v2` (
- `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `username` varchar(64) NOT NULL,
- `logo_url` varchar(255) NOT NULL,
- PRIMARY KEY (`var_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
--- --------------------------------------------------------
-
---
-- Dumping data for table `aps_settings`
--
@@ -102,7 +76,4 @@
INSERT INTO `aps_settings` (`id`, `name`, `value`) VALUES(3, 'ignore-webserver-module', '');
ALTER TABLE `client` ADD `limit_aps` int(11) NOT NULL DEFAULT '0' AFTER `limit_webdav_user`;
-ALTER TABLE `client_template` ADD `limit_aps` int(11) NOT NULL DEFAULT '0' AFTER `limit_webdav_user`;
-
--- INSERT INTO `tpl_default` (`var_id`, `username`, `logo_url`) VALUES('', 'global', 'themes/default/images/header_logo.png');
--- INSERT INTO `tpl_default-2` (`var_id`, `username`, `logo_url`) VALUES('', 'global', 'themes/default-v2/images/header_logo.png');
\ No newline at end of file
+ALTER TABLE `client_template` ADD `limit_aps` int(11) NOT NULL DEFAULT '0' AFTER `limit_webdav_user`;
\ No newline at end of file
--
Gitblit v1.9.1