maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-18 16:05:28 +01:00
parent 03e48927a3
commit 1374e08cd4
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
install/froxlor.sql
View File

@@ -508,6 +508,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'cron_allowautoupdate', '0'), ('system', 'cron_allowautoupdate', '0'),
('system', 'dns_createhostnameentry', '0'), ('system', 'dns_createhostnameentry', '0'),
('system', 'send_cron_errors', '0'), ('system', 'send_cron_errors', '0'),
('system', 'apacheitksupport', '0'),
('panel', 'decimal_places', '4'), ('panel', 'decimal_places', '4'),
('panel', 'adminmail', 'admin@SERVERNAME'), ('panel', 'adminmail', 'admin@SERVERNAME'),
('panel', 'phpmyadmin_url', ''), ('panel', 'phpmyadmin_url', ''),
@@ -538,7 +539,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_numeric', '0'), ('panel', 'password_numeric', '0'),
('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'version', '0.9.34-dev1'); ('panel', 'version', '0.9.34-dev2');
DROP TABLE IF EXISTS `panel_tasks`; 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` ( CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
`id` int(5) NOT NULL auto_increment, `id` int(5) NOT NULL auto_increment,
`domainid` int(11) NOT NULL, `domainid` int(11) NOT NULL,
`ssl_cert_file` text NOT NULL, `ssl_cert_file` mediumtext NOT NULL,
`ssl_key_file` text NOT NULL, `ssl_key_file` mediumtext NOT NULL,
`ssl_ca_file` text, `ssl_ca_file` mediumtext,
`ssl_cert_chainfile` text, `ssl_cert_chainfile` mediumtext,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci; ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;

19
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2937,3 +2937,22 @@ if (isFroxlorVersion('0.9.33.1')) {
updateToVersion('0.9.34-dev1'); 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');
}

2
lib/tables.inc.php
View File

@@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
define('TABLE_DOMAINTOIP', 'panel_domaintoip'); define('TABLE_DOMAINTOIP', 'panel_domaintoip');
// VERSION INFO // VERSION INFO
$version = '0.9.34-dev1'; $version = '0.9.34-dev2';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';