Skip to content

Commit e186515

Browse files
helmohelmo
committed
Merge remote-tracking branch 'origin/stable-3.1' into patch-show-alias-sub-domains
2 parents 67be149 + 47a687d commit e186515

File tree

525 files changed

+3219
-1909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

525 files changed

+3219
-1909
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
/nbproject/private/
33
.phplint-cache
4+
*.swp

‎install/dist/lib/fedora.lib.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ function configure_postfix($options = '')
6363
//* mysql-virtual_forwardings.cf
6464
$this->process_postfix_config('mysql-virtual_forwardings.cf');
6565

66+
//* mysql-virtual_alias_domains.cf
67+
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
68+
69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6672
//* mysql-virtual_mailboxes.cf
6773
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
6874

@@ -102,6 +108,9 @@ function configure_postfix($options = '')
102108
//* mysql-virtual_uids.cf
103109
$this->process_postfix_config('mysql-virtual_uids.cf');
104110

111+
//* mysql-virtual_alias_domains.cf
112+
$this->process_postfix_config('mysql-verify_recipients.cf');
113+
105114
//* postfix-dkim
106115
$filename='tag_as_originating.re';
107116
$full_file_name=$config_dir.'/'.$filename;
@@ -115,12 +124,6 @@ function configure_postfix($options = '')
115124
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
116125
wf($full_file_name, $content);
117126

118-
//* Changing mode and group of the new created config files.
119-
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
120-
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
121-
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
122-
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
123-
124127
//* Creating virtual mail user and group
125128
$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
126129
if(!is_group($cf['vmail_groupname'])) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ public function configure_dovecot()
338338
replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
339339
}
340340

341+
//* Get the dovecot version
342+
exec('dovecot --version', $tmp);
343+
$dovecot_version = $tmp[0];
344+
unset($tmp);
345+
341346
//* dovecot-sql.conf
342347
$configfile = $config_dir.'/dovecot-sql.conf';
343348
$content = $this->get_template_file('debian_dovecot-sql.conf', true, true);

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ function configure_postfix($options = '')
6363
//* mysql-virtual_forwardings.cf
6464
$this->process_postfix_config('mysql-virtual_forwardings.cf');
6565

66+
//* mysql-virtual_alias_domains.cf
67+
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
68+
69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6672
//* mysql-virtual_mailboxes.cf
6773
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
6874

@@ -99,6 +105,9 @@ function configure_postfix($options = '')
99105
//* mysql-virtual_uids.cf
100106
$this->process_postfix_config('mysql-virtual_uids.cf');
101107

108+
//* mysql-virtual_alias_domains.cf
109+
$this->process_postfix_config('mysql-verify_recipients.cf');
110+
102111
//* postfix-dkim
103112
$filename='tag_as_originating.re';
104113
$full_file_name=$config_dir.'/'.$filename;
@@ -112,12 +121,6 @@ function configure_postfix($options = '')
112121
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
113122
wf($full_file_name, $content);
114123

115-
//* Changing mode and group of the new created config files.
116-
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
117-
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
118-
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
119-
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
120-
121124
if(!is_dir($cf['vmail_mailbox_base'])) mkdir($cf['vmail_mailbox_base']);
122125

123126
//* Creating virtual mail user and group

‎install/lib/installer_base.lib.php‎

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -737,18 +737,30 @@ public function process_postfix_config($configfile) {
737737
global $conf;
738738

739739
$config_dir = $conf['postfix']['config_dir'].'/';
740+
$postfix_group = $conf['postfix']['group'];
740741
$full_file_name = $config_dir.$configfile;
742+
741743
//* Backup exiting file
742744
if(is_file($full_file_name)) {
743745
copy($full_file_name, $config_dir.$configfile.'~');
746+
chmod($config_dir.$configfile.'~',0600);
744747
}
748+
749+
//* Replace variables in config file template
745750
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
746751
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
747752
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
748753
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
749754
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
750755
$content = str_replace('{server_id}', $conf['server_id'], $content);
751756
wf($full_file_name, $content);
757+
758+
//* Changing mode and group of the new created config file
759+
caselog('chmod u=rw,g=r,o= '.escapeshellarg($full_file_name).' &> /dev/null',
760+
__FILE__, __LINE__, 'chmod on '.$full_file_name, 'chmod on '.$full_file_name.' failed');
761+
caselog('chgrp '.escapeshellarg($postfix_group).' '.escapeshellarg($full_file_name).' &> /dev/null',
762+
__FILE__, __LINE__, 'chgrp on '.$full_file_name, 'chgrp on '.$full_file_name.' failed');
763+
752764
}
753765

754766
public function configure_jailkit() {
@@ -876,8 +888,8 @@ public function get_postfix_service($service, $type) {
876888
$postfix_service = @($out[0]=='')?false:true;
877889
} else { //* fallback - Postfix < 2.9
878890
$content = rf($conf['postfix']['config_dir'].'/master.cf');
879-
$regex = "/^((?!#)".$service.".*".$type.".*)$/m";
880-
$postfix_service = @(preg_match($regex, $content))?true:false;
891+
$quoted_regex = "^((?!#)".preg_quote($service, '/').".*".preg_quote($type, '/').".*)$";
892+
$postfix_service = @(preg_match("/$quoted_regex/m", $content))?true:false;
881893
}
882894

883895
return $postfix_service;
@@ -915,18 +927,19 @@ public function remove_postfix_service( $service, $type ) {
915927
while ( !feof( $cf ) ) {
916928
$line = fgets( $cf );
917929

930+
$quoted_regex = '^'.preg_quote($service, '/').'\s+'.preg_quote($type, '/');
918931
if ( $reading_service ) {
919932
# regex matches a new service or "empty" (whitespace) line
920933
if ( preg_match( '/^([^\s#]+.*|\s*)$/', $line ) &&
921-
! preg_match( '/^'.$service.'\s+'.$type.'/', $line ) ) {
934+
! preg_match( "/$quoted_regex/", $line ) ) {
922935
$out .= $line;
923936
$reading_service = false;
924937
}
925938

926939
# $skipped_lines .= $line;
927940

928941
# regex matches definition matching service to be removed
929-
} else if ( preg_match( '/^'.$service.'\s+'.$type.'/', $line ) ) {
942+
} else if ( preg_match( "/$quoted_regex/", $line ) ) {
930943

931944
$reading_service = true;
932945
# $skipped_lines .= $line;
@@ -960,6 +973,12 @@ public function configure_postfix($options = '') {
960973
//* mysql-virtual_forwardings.cf
961974
$this->process_postfix_config('mysql-virtual_forwardings.cf');
962975

976+
//* mysql-virtual_alias_domains.cf
977+
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
978+
979+
//* mysql-virtual_alias_maps.cf
980+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
981+
963982
//* mysql-virtual_mailboxes.cf
964983
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
965984

@@ -999,6 +1018,9 @@ public function configure_postfix($options = '') {
9991018
//* mysql-virtual_uids.cf
10001019
$this->process_postfix_config('mysql-virtual_uids.cf');
10011020

1021+
//* mysql-virtual_alias_domains.cf
1022+
$this->process_postfix_config('mysql-verify_recipients.cf');
1023+
10021024
// test if lmtp if available
10031025
$configure_lmtp = $this->get_postfix_service('lmtp','unix');
10041026

@@ -1021,12 +1043,6 @@ public function configure_postfix($options = '') {
10211043
}
10221044
wf($full_file_name, $content);
10231045

1024-
//* Changing mode and group of the new created config files.
1025-
caselog('chmod u=rw,g=r,o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
1026-
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
1027-
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
1028-
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
1029-
10301046
//* Creating virtual mail user and group
10311047
$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
10321048
if(!is_group($cf['vmail_groupname'])) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -1151,13 +1167,13 @@ public function configure_postfix($options = '') {
11511167
if(is_file('/var/run/courier/authdaemon/')) caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
11521168

11531169
//* Check maildrop service in posfix master.cf
1154-
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
1170+
$quoted_regex = '^maildrop unix.*pipe flags=DRhu user=vmail '.preg_quote('argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}', '/');
11551171
$configfile = $config_dir.'/master.cf';
11561172
if($this->get_postfix_service('maildrop', 'unix')) {
11571173
exec ("postconf -M maildrop.unix 2> /dev/null", $out, $ret);
1158-
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
1174+
$change_maildrop_flags = @(preg_match("/$quoted_regex/", $out[0]) && $out[0] !='')?false:true;
11591175
} else {
1160-
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
1176+
$change_maildrop_flags = @(preg_match("/$quoted_regex/", $configfile))?false:true;
11611177
}
11621178
if ($change_maildrop_flags) {
11631179
//* Change maildrop service in posfix master.cf
@@ -1337,6 +1353,9 @@ public function configure_dovecot() {
13371353
}
13381354

13391355
$config_dir = $conf['postfix']['config_dir'];
1356+
$quoted_config_dir = preg_quote($config_dir, '/');
1357+
$postfix_version = `postconf -d mail_version 2>/dev/null`;
1358+
$postfix_version = preg_replace( '/mail_version\s*=\s*(.*)\s*/', '$1', $postfix_version );
13401359

13411360
//* Configure master.cf and add a line for deliver
13421361
if(!$this->get_postfix_service('dovecot', 'unix')) {
@@ -1348,7 +1367,7 @@ public function configure_dovecot() {
13481367
chmod($config_dir.'/master.cf~2', 0400);
13491368
}
13501369
//* Configure master.cf and add a line for deliver
1351-
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
1370+
$content = rf($config_dir.'/master.cf');
13521371
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
13531372
af($config_dir.'/master.cf', $deliver_content);
13541373
unset($content);
@@ -1365,7 +1384,32 @@ public function configure_dovecot() {
13651384
);
13661385

13671386
// Make a backup copy of the main.cf file
1368-
copy($conf['postfix']['config_dir'].'/main.cf', $conf['postfix']['config_dir'].'/main.cf~3');
1387+
copy($config_dir.'/main.cf', $config_dir.'/main.cf~3');
1388+
1389+
$options = preg_split("/,\s*/", exec("postconf -h smtpd_recipient_restrictions"));
1390+
$new_options = array();
1391+
foreach ($options as $value) {
1392+
$value = trim($value);
1393+
if ($value == '') continue;
1394+
if (preg_match("|check_recipient_access\s+proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
1395+
continue;
1396+
}
1397+
$new_options[] = $value;
1398+
}
1399+
if ($configure_lmtp) {
1400+
for ($i = 0; isset($new_options[$i]); $i++) {
1401+
if ($new_options[$i] == 'reject_unlisted_recipient') {
1402+
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${config_dir}/mysql-verify_recipients.cf"));
1403+
break;
1404+
}
1405+
}
1406+
# postfix < 3.3 needs this when using reject_unverified_recipient:
1407+
if(version_compare($postfix_version, 3.3, '<')) {
1408+
$postconf_commands[] = "enable_original_recipient = yes";
1409+
}
1410+
}
1411+
#exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
1412+
$postconf_commands[] = "smtpd_recipient_restrictions = ".implode(", ", $new_options);
13691413

13701414
// Executing the postconf commands
13711415
foreach($postconf_commands as $cmd) {
@@ -1605,12 +1649,16 @@ public function configure_rspamd() {
16051649

16061650
exec("postconf -e 'smtpd_sender_restrictions = check_sender_access mysql:/etc/postfix/mysql-virtual_sender.cf, permit_mynetworks, permit_sasl_authenticated'");
16071651

1608-
$new_options = array();
1652+
16091653
$options = preg_split("/,\s*/", exec("postconf -h smtpd_recipient_restrictions"));
1654+
$new_options = array();
16101655
foreach ($options as $value) {
1611-
if (!preg_match('/check_policy_service\s+inet:127.0.0.1:10023/', $value)) {
1612-
$new_options[] = $value;
1656+
$value = trim($value);
1657+
if ($value == '') continue;
1658+
if (preg_match('/check_policy_service\s+inet:127.0.0.1:10023/', $value)) {
1659+
continue;
16131660
}
1661+
$new_options[] = $value;
16141662
}
16151663
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
16161664

@@ -1766,7 +1814,12 @@ public function configure_rspamd() {
17661814

17671815
$tpl = new tpl();
17681816
$tpl->newTemplate('rspamd_worker-controller.inc.master');
1769-
$tpl->setVar('rspamd_password', $mail_config['rspamd_password']);
1817+
$rspamd_password = $mail_config['rspamd_password'];
1818+
$crypted_password = trim(exec('rspamadm pw -p ' . escapeshellarg($rspamd_password)));
1819+
if($crypted_password) {
1820+
$rspamd_password = $crypted_password;
1821+
}
1822+
$tpl->setVar('rspamd_password', $rspamd_password);
17701823
wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());
17711824
chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);
17721825
}

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,28 @@ ALTER TABLE `web_domain` DROP COLUMN `enable_spdy`;
4545
-- was missing in incremental, inserted for fixing older installations
4646
ALTER TABLE `web_domain` ADD `folder_directive_snippets` TEXT NULL AFTER `https_port`;
4747

48+
ALTER TABLE `web_domain` ADD `server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0;
49+
50+
UPDATE `web_domain` as w LEFT JOIN sys_group as g ON (g.groupid = w.sys_groupid) INNER JOIN `server_php` as p ON (w.fastcgi_php_version = CONCAT(p.name, ':', p.php_fastcgi_binary, ':', p.php_fastcgi_ini_dir) AND p.server_id IN (0, w.server_id) AND p.client_id IN (0, g.client_id)) SET w.server_php_id = p.server_php_id, w.fastcgi_php_version = '' WHERE 1;
51+
52+
UPDATE `web_domain` as w LEFT JOIN sys_group as g ON (g.groupid = w.sys_groupid) INNER JOIN `server_php` as p ON (w.fastcgi_php_version = CONCAT(p.name, ':', p.php_fpm_init_script, ':', p.php_fpm_ini_dir, ':', p.php_fpm_pool_dir) AND p.server_id IN (0, w.server_id) AND p.client_id IN (0, g.client_id)) SET w.server_php_id = p.server_php_id, w.fastcgi_php_version = '' WHERE 1;
53+
54+
-- we have to decide whether to delete the column or leave it there for investigating not-converted entries
55+
-- ALTER TABLE `web_domain` DROP COLUMN `fastcgi_php_version`;
56+
4857
ALTER TABLE `web_domain` CHANGE `apache_directives` `apache_directives` mediumtext NULL DEFAULT NULL;
49-
ALTER TABLE `web_domain` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
58+
ALTER TABLE `web_domain` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
59+
60+
-- add move to junk before/after option, default to after
61+
ALTER TABLE `mail_user` MODIFY `move_junk` enum('y','a','n') NOT NULL DEFAULT 'y';
62+
63+
-- Change id_rsa column to TEXT format
64+
ALTER TABLE `client` CHANGE `id_rsa` `id_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
65+
66+
ALTER TABLE `directive_snippets` ADD `update_sites` ENUM('y','n') NOT NULL DEFAULT 'n' ;
67+
68+
-- Add DNSSEC Algorithm setting
69+
ALTER TABLE `dns_soa` ADD `dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') NULL DEFAULT NULL AFTER `dnssec_wanted`;
70+
UPDATE `dns_soa` SET `dnssec_algo` = 'NSEC3RSASHA1' WHERE `dnssec_algo` IS NULL AND dnssec_initialized = 'Y';
71+
UPDATE `dns_soa` SET `dnssec_algo` = 'ECDSAP256SHA256' WHERE `dnssec_algo` IS NULL AND dnssec_initialized = 'N';
72+
ALTER TABLE `dns_soa` CHANGE `dnssec_algo` `dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'ECDSAP256SHA256';

‎install/sql/ispconfig3.sql‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ CREATE TABLE `client` (
253253
`canceled` enum('n','y') NOT NULL DEFAULT 'n',
254254
`can_use_api` enum('n','y') NOT NULL DEFAULT 'n',
255255
`tmp_data` mediumblob,
256-
`id_rsa` varchar(2000) NOT NULL DEFAULT '',
256+
`id_rsa` text NOT NULL DEFAULT '',
257257
`ssh_rsa` varchar(600) NOT NULL DEFAULT '',
258258
`customer_no_template` varchar(255) DEFAULT 'R[CLIENTID]C[CUSTOMER_NO]',
259259
`customer_no_start` int(11) NOT NULL DEFAULT '1',
@@ -470,6 +470,7 @@ CREATE TABLE IF NOT EXISTS `directive_snippets` (
470470
`required_php_snippets` varchar(255) NOT NULL DEFAULT '',
471471
`active` enum('n','y') NOT NULL DEFAULT 'y',
472472
`master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0',
473+
`update_sites` ENUM('y','n') NOT NULL DEFAULT 'n',
473474
PRIMARY KEY (`directive_snippets_id`)
474475
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
475476

@@ -625,6 +626,7 @@ CREATE TABLE `dns_soa` (
625626
`update_acl` varchar(255) default NULL,
626627
`dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
627628
`dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
629+
`dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') NOT NULL DEFAULT 'ECDSAP256SHA256',
628630
`dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
629631
`dnssec_info` TEXT NULL,
630632
PRIMARY KEY (`id`),
@@ -1046,7 +1048,7 @@ CREATE TABLE `mail_user` (
10461048
`autoresponder_end_date` datetime NULL default NULL,
10471049
`autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply',
10481050
`autoresponder_text` mediumtext NULL,
1049-
`move_junk` enum('n','y') NOT NULL default 'n',
1051+
`move_junk` enum('y','a','n') NOT NULL default 'y',
10501052
`purge_trash_days` INT NOT NULL DEFAULT '0',
10511053
`purge_junk_days` INT NOT NULL DEFAULT '0',
10521054
`custom_mailfilter` mediumtext,
@@ -2081,6 +2083,7 @@ CREATE TABLE `web_domain` (
20812083
`folder_directive_snippets` text,
20822084
`log_retention` int(11) NOT NULL DEFAULT '10',
20832085
`proxy_protocol` enum('n','y') NOT NULL default 'n',
2086+
`server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0,
20842087
PRIMARY KEY (`domain_id`),
20852088
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
20862089
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -2499,7 +2502,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`)
24992502
-- Dumping data for table `dns_template`
25002503
--
25012504

2502-
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
2505+
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\ndnssec_algo=ECDSAP256SHA256\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
25032506

25042507

25052508
-- --------------------------------------------------------

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
3535
</tmpl_if>
3636
</Directory>
3737

38+
<Directory /var/www>
39+
Options -Indexes
40+
</Directory>
41+
3842
<Directory /var/www/conf>
3943
AllowOverride None
4044
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>

0 commit comments

Comments
 (0)