From 1374e08cd423bd746e0917b4ce331f7ec382e324 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 18 Feb 2015 16:05:28 +0100
Subject: [PATCH] make sql-fields for ssl-certs larger as there are
 ca-bundle-certs larger then 64k; add new settings for apache-itk-mpm
 integration, fixes #1400

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 install/froxlor.sql                           | 11 ++++++-----
 .../updates/froxlor/0.9/update_0.9.inc.php    | 19 +++++++++++++++++++
 lib/tables.inc.php                            |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index 929b5ba1..1acc18ca 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -508,6 +508,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'cron_allowautoupdate', '0'),
 	('system', 'dns_createhostnameentry', '0'),
 	('system', 'send_cron_errors', '0'),
+	('system', 'apacheitksupport', '0'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -538,7 +539,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'password_numeric', '0'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
-	('panel', 'version', '0.9.34-dev1');
+	('panel', 'version', '0.9.34-dev2');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
@@ -816,10 +817,10 @@ DROP TABLE IF EXISTS `domain_ssl_settings`;
 CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
   `id` int(5) NOT NULL auto_increment,
   `domainid` int(11) NOT NULL,
-  `ssl_cert_file` text NOT NULL,
-  `ssl_key_file` text NOT NULL,
-  `ssl_ca_file` text,
-  `ssl_cert_chainfile` text,
+  `ssl_cert_file` mediumtext NOT NULL,
+  `ssl_key_file` mediumtext NOT NULL,
+  `ssl_ca_file` mediumtext,
+  `ssl_cert_chainfile` mediumtext,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 2149fbb2..451817fc 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2937,3 +2937,22 @@ if (isFroxlorVersion('0.9.33.1')) {
 
     updateToVersion('0.9.34-dev1');
 }
+
+if (isFroxlorVersion('0.9.34-dev1')) {
+
+    showUpdateStep("Updating from 0.9.34-dev1 to 0.9.34-dev2");
+
+    showUpdateStep("Adding new settings for apache-itk-mpm");
+    Settings::AddNew("system.apacheitksupport", '0');
+    lastStepStatus(0);
+
+    showUpdateStep("Increase text-field size of domain-ssl table");
+    Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_cert_file` mediumtext NOT NULL");
+    Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_key_file` mediumtext NOT NULL");
+    Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_ca_file` mediumtext NOT NULL");
+    Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_cert_chainfile` mediumtext NOT NULL");
+    lastStepStatus(0);
+
+    updateToVersion('0.9.34-dev2');
+
+}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 2b4ace00..323dca11 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
 define('TABLE_DOMAINTOIP', 'panel_domaintoip');
 
 // VERSION INFO
-$version = '0.9.34-dev1';
+$version = '0.9.34-dev2';
 $dbversion = '2';
 $branding = '';