Skip to content

Commit f163408

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/web/admin/lib/lang/se_remote_action.lng interface/web/admin/lib/lang/se_system_config.lng interface/web/dashboard/lib/lang/se_dashlet_limits.lng interface/web/mail/lib/lang/se_mail_domain.lng interface/web/monitor/lib/lang/se.lng interface/web/sites/lib/lang/se_web_aliasdomain.lng interface/web/sites/lib/lang/se_web_domain_list.lng interface/web/sites/lib/lang/se_web_subdomain.lng interface/web/sites/lib/lang/se_web_subdomain_list.lng interface/web/sites/lib/lang/se_web_vhost_domain.lng interface/web/sites/lib/lang/se_web_vhost_subdomain.lng interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng server/mods-available/rescue_core_module.inc.php server/plugins-available/cron_plugin.inc.php
2 parents 306c962 + 1deddf5 commit f163408

File tree

230 files changed

+1972
-1673
lines changed

Some content is hidden

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

230 files changed

+1972
-1673
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
@@ -405,7 +405,6 @@ public function configure_dovecot()
405405
'virtual_transport = lmtp:unix:private/dovecot-lmtp',
406406
'smtpd_sasl_type = dovecot',
407407
'smtpd_sasl_path = private/auth',
408-
'receive_override_options = no_address_mappings'
409408
);
410409

411410
// Make a backup copy of the main.cf file
@@ -451,6 +450,8 @@ public function configure_dovecot()
451450
copy("$config_dir/$configfile", "$config_dir/$configfile~");
452451
exec("chmod 400 $config_dir/$configfile~");
453452
}
453+
454+
if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');
454455

455456
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.conf.master");
456457
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
@@ -463,7 +464,7 @@ public function configure_dovecot()
463464
exec("chown root:root $config_dir/$configfile");
464465

465466
// Dovecot shall ignore mounts in website directory
466-
exec("doveadm mount add '/var/www/*' ignore");
467+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
467468

468469
}
469470

@@ -1227,6 +1228,9 @@ public function install_ispconfig()
12271228

12281229
//* Remove Domain module as its functions are available in the client module now
12291230
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1231+
1232+
// Add symlink for patch tool
1233+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
12301234

12311235
}
12321236

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

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

11041104
//* Remove Domain module as its functions are available in the client module now
11051105
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1106+
1107+
// Add symlink for patch tool
1108+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
11061109

11071110
}
11081111

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ public function configure_dovecot()
456456
'virtual_transport = lmtp:unix:private/dovecot-lmtp',
457457
'smtpd_sasl_type = dovecot',
458458
'smtpd_sasl_path = private/auth',
459-
'receive_override_options = no_address_mappings'
460459
);
461460

462461
// Make a backup copy of the main.cf file
@@ -514,7 +513,7 @@ public function configure_dovecot()
514513
exec("chown root:root $config_dir/$configfile");
515514

516515
// Dovecot shall ignore mounts in website directory
517-
exec("doveadm mount add '/srv/www/*' ignore");
516+
if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
518517

519518
}
520519

@@ -1299,6 +1298,9 @@ public function install_ispconfig()
12991298

13001299
//* Remove Domain module as its functions are available in the client module now
13011300
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1301+
1302+
// Add symlink for patch tool
1303+
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
13021304

13031305

13041306
}

‎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
@@ -699,7 +699,7 @@ public function configure_postfix($options = '') {
699699
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
700700

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

@@ -2144,7 +2144,8 @@ public function install_ispconfig() {
21442144
replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
21452145
}
21462146

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

21492150
}
21502151

‎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/ispconfig3.sql‎

Lines changed: 1 addition & 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',

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ server {
55

66
root {apps_vhost_dir};
77

8-
client_max_body_size 20M;
8+
client_max_body_size 100M;
99

1010
location / {
1111
index index.php index.html;

0 commit comments

Comments
 (0)