From 7799762f2a7ac3835f5e1f238ef32143fdeb3455 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 20 Jan 2016 04:13:09 -0500
Subject: [PATCH] Mail Security: implemented a SendAs-Permission for aliases and forwardings (by dark alex) NOTE: I did only translate de and en!

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

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index d9bca16..e93790a 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',
@@ -188,4 +188,20 @@
   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';
\ No newline at end of file
+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';
+
+
+
+
+-- Mail Security: Send As Permission by dark alex
+-- MS: alter table
+ALTER TABLE `mail_forwarding`
+	ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
+-- MS: apply defaults
+update mail_forwarding set allow_send_as='y' WHERE type = 'alias';
+
+
+

--
Gitblit v1.9.1