From 3cf7090e7bed850a5ff7c3dd21bb88ee80d3914e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 15 Apr 2014 04:20:24 -0400
Subject: [PATCH] Implemented: FS#3437 - Activate Postfix submission Port 587 in Firewall
---
install/sql/ispconfig3.sql | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index cbb0998..2881525 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -169,7 +169,7 @@
`bank_account_swift` varchar(255) DEFAULT NULL,
`paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
- `mail_servers` blob NOT NULL DEFAULT '',
+ `mail_servers` blob NOT NULL,
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
`limit_mailalias` int(11) NOT NULL DEFAULT '-1',
@@ -184,7 +184,7 @@
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
- `web_servers` blob NOT NULL DEFAULT '',
+ `web_servers` blob NOT NULL,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
@@ -204,15 +204,16 @@
`limit_shell_user` int(11) NOT NULL DEFAULT '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
`limit_webdav_user` int(11) NOT NULL DEFAULT '0',
+ `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
- `db_servers` blob NOT NULL DEFAULT '',
+ `db_servers` blob NOT NULL,
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
`default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
`limit_dns_record` int(11) NOT NULL DEFAULT '-1',
`default_dbserver` int(11) NOT NULL DEFAULT '1',
- `dns_servers` blob NOT NULL DEFAULT '',
+ `dns_servers` blob NOT NULL,
`limit_database` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL DEFAULT '0',
@@ -313,6 +314,7 @@
`limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0',
+ `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
@@ -740,8 +742,9 @@
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
- `dkim_private` mediumtext NOT NULL,
- `dkim_public` mediumtext NOT NULL,
+ `dkim_selector` varchar(63) NOT NULL DEFAULT 'default',
+ `dkim_private` mediumtext NULL,
+ `dkim_public` mediumtext NULL,
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
@@ -918,7 +921,7 @@
`disablelmtp` enum('n','y') NOT NULL default 'n',
`disabledoveadm` enum('n','y') NOT NULL default 'n',
`last_quota_notification` date NULL default NULL,
- `backup_interval` VARCHAR( 255 ) NOT NULL,
+ `backup_interval` VARCHAR( 255 ) NOT NULL default 'none',
`backup_copies` INT NOT NULL DEFAULT '1',
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
@@ -1852,7 +1855,7 @@
`allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` mediumtext,
`nginx_directives` mediumtext,
- `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n',
+ `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
`pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
`pm_max_children` int(11) NOT NULL DEFAULT '10',
`pm_start_servers` int(11) NOT NULL DEFAULT '2',
@@ -2006,7 +2009,7 @@
('CL', 'CHILE', 'Chile', 'CHL', 152, 'n'),
('CN', 'CHINA', 'China', 'CHN', 156, 'n'),
('CX', 'CHRISTMAS ISLAND', 'Christmas Island', NULL, NULL, 'n'),
-('CC', 'COCOS (KEELING, 'n') ISLANDS', 'Cocos (Keeling, 'n') Islands', NULL, NULL, 'n'),
+('CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', NULL, NULL, 'n'),
('CO', 'COLOMBIA', 'Colombia', 'COL', 170, 'n'),
('KM', 'COMOROS', 'Comoros', 'COM', 174, 'n'),
('CG', 'CONGO', 'Congo', 'COG', 178, 'n'),
@@ -2029,7 +2032,7 @@
('ER', 'ERITREA', 'Eritrea', 'ERI', 232, 'n'),
('EE', 'ESTONIA', 'Estonia', 'EST', 233, 'y'),
('ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231, 'n'),
-('FK', 'FALKLAND ISLANDS (MALVINAS, 'n')', 'Falkland Islands (Malvinas, 'n')', 'FLK', 238, 'n'),
+('FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238, 'n'),
('FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234, 'n'),
('FJ', 'FIJI', 'Fiji', 'FJI', 242, 'n'),
('FI', 'FINLAND', 'Finland', 'FIN', 246, 'y'),
@@ -2054,7 +2057,7 @@
('GY', 'GUYANA', 'Guyana', 'GUY', 328, 'n'),
('HT', 'HAITI', 'Haiti', 'HTI', 332, 'n'),
('HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', NULL, NULL, 'n'),
-('VA', 'HOLY SEE (VATICAN CITY STATE, 'n')', 'Holy See (Vatican City State, 'n')', 'VAT', 336, 'n'),
+('VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336, 'n'),
('HN', 'HONDURAS', 'Honduras', 'HND', 340, 'n'),
('HK', 'HONG KONG', 'Hong Kong', 'HKG', 344, 'n'),
('HU', 'HUNGARY', 'Hungary', 'HUN', 348, 'y'),
@@ -2287,7 +2290,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4dev');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4rc1');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1