From 4ad68490e148d745a17245a95f03c2995cae4696 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 06 Jan 2014 05:47:31 -0500
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

---
 install/sql/ispconfig3.sql |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 58722c6..3d09f42 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -651,6 +651,24 @@
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table  `mail_backup`
+--
+
+CREATE TABLE `mail_backup` (
+  `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `server_id` int(10) unsigned NOT NULL,
+  `parent_domain_id` int(10) unsigned NOT NULL,
+  `mailuser_id` int(10) unsigned NOT NULL,
+  `backup_mode` varchar(64) NOT NULL DEFAULT  '',
+  `tstamp` int(10) unsigned NOT NULL,
+  `filename` varchar(255) NOT NULL,
+  `filesize` VARCHAR(10) NOT NULL,
+  PRIMARY KEY (`backup_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table  `mail_content_filter`
 -- 
@@ -863,6 +881,8 @@
   `disablelda` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,
+  `backup_interval` VARCHAR( 255 ) NOT NULL,
+  `backup_copies` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`mailuser_id`),
   KEY `server_id` (`server_id`,`email`),
   KEY `email_access` (`email`,`access`)

--
Gitblit v1.9.1