Merge remote-tracking branch 'origin/master' into 0.10.0

This commit is contained in:
Michael Kaufmann (d00p) 2018-03-13 10:41:01 +01:00
commit fe385b7800

View File

@ -280,11 +280,11 @@ CREATE TABLE `panel_ipsandports` (
`vhostcontainer_servername_statement` tinyint(1) NOT NULL default '0',
`specialsettings` text,
`ssl` tinyint(4) NOT NULL default '0',
`ssl_cert_file` varchar(255) NOT NULL,
`ssl_key_file` varchar(255) NOT NULL,
`ssl_ca_file` varchar(255) NOT NULL,
`ssl_cert_file` varchar(255) NOT NULL default '',
`ssl_key_file` varchar(255) NOT NULL default '',
`ssl_ca_file` varchar(255) NOT NULL default '',
`default_vhostconf_domain` text,
`ssl_cert_chainfile` varchar(255) NOT NULL,
`ssl_cert_chainfile` varchar(255) NOT NULL default '',
`docroot` varchar(255) NOT NULL default '',
PRIMARY KEY (`id`),
UNIQUE KEY `ip_port` (`ip`,`port`)
@ -1001,8 +1001,8 @@ 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` mediumtext NOT NULL,
`ssl_key_file` mediumtext NOT NULL,
`ssl_cert_file` mediumtext,
`ssl_key_file` mediumtext,
`ssl_ca_file` mediumtext,
`ssl_cert_chainfile` mediumtext,
`ssl_csr_file` mediumtext,