From bb5ccb0028569fadceea2240d85a9aaf901ea588 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 10 Jan 2015 15:36:22 +0100
Subject: [PATCH] moved inc-sql-updates to upd_dev_collection.sql
---
install/sql/incremental/upd_0081.sql | 19 --------------
install/sql/incremental/upd_0082.sql | 1 -
.../sql/incremental/upd_dev_collection.sql | 25 ++++++++++++++++++-
3 files changed, 24 insertions(+), 21 deletions(-)
delete mode 100644 install/sql/incremental/upd_0081.sql
delete mode 100644 install/sql/incremental/upd_0082.sql
diff --git a/install/sql/incremental/upd_0081.sql b/install/sql/incremental/upd_0081.sql
deleted file mode 100644
index 315e9ddbff..0000000000
--- a/install/sql/incremental/upd_0081.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-UPDATE `dns_template` SET `fields` = 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM' WHERE `dns_template`.`template_id` =1;
-UPDATE `dns_template` SET `template` = '[ZONE]
-origin={DOMAIN}.
-ns={NS1}.
-mbox={EMAIL}.
-refresh=7200
-retry=540
-expire=604800
-minimum=86400
-ttl=3600
-
-[DNS_RECORDS]
-A|{DOMAIN}.|{IP}|0|3600
-A|www|{IP}|0|3600
-A|mail|{IP}|0|3600
-NS|{DOMAIN}.|{NS1}.|0|3600
-NS|{DOMAIN}.|{NS2}.|0|3600
-MX|{DOMAIN}.|mail.{DOMAIN}.|10|3600
-TXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600' WHERE `dns_template`.`template_id` = 1;
diff --git a/install/sql/incremental/upd_0082.sql b/install/sql/incremental/upd_0082.sql
deleted file mode 100644
index c35071124a..0000000000
--- a/install/sql/incremental/upd_0082.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `mail_user` ADD COLUMN `sender_cc` varchar(255) NOT NULL default '' AFTER `cc`;
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 358152786f..87eaa0984d 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,7 +1,9 @@
ALTER TABLE `mail_user`
CHANGE `uid` `uid` int(11) NOT NULL DEFAULT '5000',
CHANGE `gid` `gid` int(11) NOT NULL DEFAULT '5000';
- ADD COLUMN `sender_cc` varchar(255) NOT NULL default '' AFTER `cc`;
+
+ALTER TABLE `mail_user`
+ ADD COLUMN `sender_cc` varchar(255) NOT NULL DEFAULT '' AFTER `cc`;
ALTER TABLE `client_template` ADD `default_mailserver` INT(11) NOT NULL DEFAULT 1;
ALTER TABLE `client_template` ADD `default_webserver` INT(11) NOT NULL DEFAULT 1;
@@ -9,3 +11,24 @@ ALTER TABLE `client_template` ADD `default_dnsserver` INT(11) NOT NULL DEFAULT 1
ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT(11) NOT NULL DEFAULT 1;
ALTER TABLE `client_template` ADD `default_dbserver` INT(11) NOT NULL DEFAULT 1;
ALTER TABLE `client` ADD `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER `gender`;
+
+UPDATE `dns_template` SET `fields` = 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM' WHERE `dns_template`.`template_id` =1;
+UPDATE `dns_template` SET `template` = '[ZONE]
+origin={DOMAIN}.
+ns={NS1}.
+mbox={EMAIL}.
+refresh=7200
+retry=540
+expire=604800
+minimum=86400
+ttl=3600
+
+[DNS_RECORDS]
+A|{DOMAIN}.|{IP}|0|3600
+A|www|{IP}|0|3600
+A|mail|{IP}|0|3600
+NS|{DOMAIN}.|{NS1}.|0|3600
+NS|{DOMAIN}.|{NS2}.|0|3600
+MX|{DOMAIN}.|mail.{DOMAIN}.|10|3600
+TXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600' WHERE `dns_template`.`template_id` = 1;
+
--
GitLab