From c3fd2b1a66fa79fde4e73b44228e3df734ad62bc Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 20 Jan 2016 07:48:04 -0500
Subject: [PATCH] cleanup

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

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 3e80fbd..afc864d 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,17 @@
   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' AFETR `ssl`;
+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';
+
+
+--- DNSSEC-Implementation by dark alex
+--- TODO: Review and resolve conflicts if more has been done in that column
+ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
+
+ALTER TABLE `dns_soa`
+	ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
+	ADD COLUMN `dnssec_info` TEXT NULL;
+

--
Gitblit v1.9.1