Skip to content

Commit 31230cb

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5
2 parents 5335a40 + 1deddf5 commit 31230cb

File tree

236 files changed

+2299
-1704
lines changed

Some content is hidden

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

236 files changed

+2299
-1704
lines changed

‎install/autoupdate.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,10 @@
198198
$inst->configure_postfix('dont-create-certs');
199199

200200
//** Configure mailman
201-
swriteln('Configuring Mailman');
202-
$inst->configure_mailman('update');
201+
if($conf['mailman']['installed'] == true) {
202+
swriteln('Configuring Mailman');
203+
$inst->configure_mailman('update');
204+
}
203205

204206
//* Configure Jailkit
205207
swriteln('Configuring Jailkit');

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ public function configure_dovecot()
392392
'virtual_transport = dovecot',
393393
'smtpd_sasl_type = dovecot',
394394
'smtpd_sasl_path = private/auth',
395-
'receive_override_options = no_address_mappings'
396395
);
397396

398397
// Make a backup copy of the main.cf file
@@ -438,6 +437,8 @@ public function configure_dovecot()
438437
copy("$config_dir/$configfile", "$config_dir/$configfile~");
439438
exec("chmod 400 $config_dir/$configfile~");
440439
}
440+
441+
if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');
441442

442443
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.conf.master");
443444
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
@@ -450,7 +451,7 @@ public function configure_dovecot()
450451
exec("chown root:root $config_dir/$configfile");
451452

452453
// Dovecot shall ignore mounts in website directory
453-
exec("doveadm mount add '/var/www/*' ignore");
454+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
454455

455456
}
456457

@@ -1202,6 +1203,9 @@ public function install_ispconfig()
12021203

12031204
//* Remove Domain module as its functions are available in the client module now
12041205
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1206+
1207+
// Add symlink for patch tool
1208+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
12051209

12061210
}
12071211

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,9 @@ public function install_ispconfig()
10791079

10801080
//* Remove Domain module as its functions are available in the client module now
10811081
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1082+
1083+
// Add symlink for patch tool
1084+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
10821085

10831086
}
10841087

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ public function configure_dovecot()
443443
'virtual_transport = dovecot',
444444
'smtpd_sasl_type = dovecot',
445445
'smtpd_sasl_path = private/auth',
446-
'receive_override_options = no_address_mappings'
447446
);
448447

449448
// Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@ public function configure_dovecot()
501500
exec("chown root:root $config_dir/$configfile");
502501

503502
// Dovecot shall ignore mounts in website directory
504-
exec("doveadm mount add '/srv/www/*' ignore");
503+
if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
505504

506505
}
507506

@@ -1274,6 +1273,9 @@ public function install_ispconfig()
12741273

12751274
//* Remove Domain module as its functions are available in the client module now
12761275
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1276+
1277+
// Add symlink for patch tool
1278+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
12771279

12781280

12791281
}

‎install/install.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@
191191
$inst->configure_postfix();
192192

193193
//* Configure Mailman
194-
$inst->configure_mailman('install');
194+
if($conf['mailman']['installed'] == true) {
195+
$inst->configure_mailman('install');
196+
}
195197

196198
//* Configure jailkit
197199
swriteln('Configuring Jailkit');

‎install/lib/installer_base.lib.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ public function configure_postfix($options = '') {
690690
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
691691

692692
//* These postconf commands will be executed on installation and update
693-
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
693+
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM `" . $this->db->quote($conf["mysql"]["database"]) . "`.`server` WHERE server_id = ".$conf['server_id']);
694694
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
695695
unset($server_ini_rec);
696696

@@ -2112,7 +2112,8 @@ public function install_ispconfig() {
21122112
replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
21132113
}
21142114

2115-
2115+
// Add symlink for patch tool
2116+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
21162117

21172118
}
21182119

‎install/sql/incremental/upd_0074.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ALTER TABLE `dns_rr`
4949
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
5050
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
5151
CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
52-
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
52+
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
5353
CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
5454

5555
ALTER TABLE `dns_slave`

‎install/sql/incremental/upd_0076.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `dns_rr` CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '';

‎install/sql/incremental/upd_0077.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `ftp_user` ADD `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `dl_bandwidth` ;

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ CREATE TABLE `dns_rr` (
447447
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
448448
`server_id` int(11) NOT NULL default '1',
449449
`zone` int(11) unsigned NOT NULL DEFAULT '0',
450-
`name` varchar(64) NOT NULL DEFAULT '',
450+
`name` varchar(255) NOT NULL DEFAULT '',
451451
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
452452
`data` varchar(255) NOT NULL DEFAULT '',
453453
`aux` int(11) unsigned NOT NULL default '0',
@@ -598,6 +598,7 @@ CREATE TABLE `ftp_user` (
598598
`dl_ratio` int(11) NOT NULL default '-1',
599599
`ul_bandwidth` int(11) NOT NULL default '-1',
600600
`dl_bandwidth` int(11) NOT NULL default '-1',
601+
`expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
601602
PRIMARY KEY (`ftp_user_id`),
602603
KEY `active` (`active`),
603604
KEY `server_id` (`server_id`),

0 commit comments

Comments
 (0)