From 337473b29af23892d2bcbe4cc97c087aa5ff8b30 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Jan 2016 05:02:40 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/sql/incremental/upd_dev_collection.sql | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 81c64d9..624d748 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -99,7 +99,7 @@
`vjud_opt_mode` enum('in', 'out') NOT NULL DEFAULT 'in',
`use_muc_host` enum('n','y') NOT NULL DEFAULT 'n',
- `muc_name` varchar(30) NOT NULL DEFAULT ''
+ `muc_name` varchar(30) NOT NULL DEFAULT '',
`muc_restrict_room_creation` enum('n', 'y', 'm') NOT NULL DEFAULT 'm',
`muc_admins` text,
`use_pastebin` enum('n','y') NOT NULL DEFAULT 'n',
@@ -187,3 +187,19 @@
ALTER TABLE openvz_vm
ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
ADD COLUMN `custom` text;
+
+ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `ssl`;
+
+ALTER TABLE `openvz_template` CHANGE `vmguarpages` `vmguarpages` varchar(255) DEFAULT '65536:unlimited';
+ALTER TABLE `openvz_template` CHANGE `privvmpages` `privvmpages` varchar(255) DEFAULT '131072:139264';
+
+CREATE TABLE `ftp_traffic` (
+ `hostname` varchar(255) NOT NULL,
+ `traffic_date` date NOT NULL,
+ `in_bytes` bigint(32) unsigned NOT NULL,
+ `out_bytes` bigint(32) unsigned NOT NULL,
+ PRIMARY KEY (`hostname`,`traffic_date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `mail_forwarding` ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
+UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';
--
Gitblit v1.9.1