From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/sql/ispconfig3.sql | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 17b08b6..eaf060a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -170,7 +170,7 @@
`bank_account_swift` varchar(255) DEFAULT NULL,
`paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
- `mail_servers` blob,
+ `mail_servers` text,
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
`limit_mailalias` int(11) NOT NULL DEFAULT '-1',
@@ -185,7 +185,7 @@
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
- `xmpp_servers` blob,
+ `xmpp_servers` text,
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
@@ -197,7 +197,7 @@
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
- `web_servers` blob,
+ `web_servers` text,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
@@ -222,13 +222,13 @@
`limit_directive_snippets` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
- `db_servers` blob,
+ `db_servers` text,
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
`default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
`limit_dns_record` int(11) NOT NULL DEFAULT '-1',
`default_dbserver` int(11) NOT NULL DEFAULT '1',
- `dns_servers` blob,
+ `dns_servers` text,
`limit_database` int(11) NOT NULL DEFAULT '-1',
`limit_database_user` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
@@ -301,6 +301,7 @@
`sys_perm_other` varchar(5) default NULL,
`template_name` varchar(64) NOT NULL DEFAULT '',
`template_type` varchar(1) NOT NULL default 'm',
+ `mail_servers` text,
`limit_maildomain` int(11) NOT NULL default '-1',
`limit_mailbox` int(11) NOT NULL default '-1',
`limit_mailalias` int(11) NOT NULL default '-1',
@@ -315,7 +316,7 @@
`limit_spamfilter_user` int(11) NOT NULL default '0',
`limit_spamfilter_policy` int(11) NOT NULL default '0',
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
- `xmpp_servers` blob,
+ `xmpp_servers` text,
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
@@ -325,6 +326,7 @@
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
+ `web_servers` text,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
`limit_web_quota` int(11) NOT NULL default '-1',
@@ -348,9 +350,12 @@
`limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_directive_snippets` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
+ `dns_servers` text,
`limit_dns_zone` int(11) NOT NULL default '-1',
+ `default_slave_dnsserver` int(11) NOT NULL DEFAULT '0',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
`limit_dns_record` int(11) NOT NULL default '-1',
+ `db_servers` text,
`limit_database` int(11) NOT NULL default '-1',
`limit_database_user` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
@@ -657,7 +662,7 @@
`traffic_date` date NOT NULL,
`in_bytes` bigint(32) unsigned NOT NULL,
`out_bytes` bigint(32) unsigned NOT NULL,
- PRIMARY KEY (`hostname`,`traffic_date`)
+ UNIQUE KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -1153,7 +1158,7 @@
`veid` int(11) NOT NULL DEFAULT '0',
`traffic_date` date NULL DEFAULT NULL,
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`veid`,`traffic_date`)
+ UNIQUE KEY (`veid`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--
@@ -2043,7 +2048,7 @@
`hostname` varchar(255) NOT NULL DEFAULT '',
`traffic_date` date NULL DEFAULT NULL,
`traffic_bytes` bigint(32) unsigned NOT NULL default '0',
- PRIMARY KEY (`hostname`,`traffic_date`)
+ UNIQUE KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
@@ -2477,7 +2482,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('db','db_version','3.1a1');
+INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1