Skip to content

Commit 1f50209

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
Master See merge request !211
2 parents 4e5e9b5 + 66fa9bd commit 1f50209

Some content is hidden

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

56 files changed

+141
-114
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public function configure_dovecot()
290290
//* Configure master.cf and add a line for deliver
291291
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
292292
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
293-
af($conf[$config_dir.'/master.cf', $deliver_content);
293+
af($configdir.'/master.cf', $deliver_content);
294294
unset($content);
295295
unset($deliver_content);
296296
}

‎install/install.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,11 @@
248248
$inst->add_database_server_record();
249249

250250
//* Configure Postgrey
251-
$force = @($conf['postgrey']['installed']) ? true : $inst->force_configure_app('Postgrey');
251+
$force = @($conf['postgrey']['installed']) ? true : $inst->force_configure_app('Postgrey', false);
252252
if($force) swriteln('Configuring Postgrey');
253253

254254
//* Configure Postfix
255-
$force = @($conf['postfix']['installed']) ? true : $inst->force_configure_app('Postfix');
255+
$force = @($conf['postfix']['installed']) ? true : $inst->force_configure_app('Postfix', false);
256256
if($force) {
257257
swriteln('Configuring Postfix');
258258
$inst->configure_postfix();
@@ -262,16 +262,16 @@
262262
if($conf['services']['mail']) {
263263

264264
//* Configure Mailman
265-
$force = @($conf['mailman']['installed']) ? true : $inst->force_configure_app('Mailman');
265+
$force = @($conf['mailman']['installed']) ? true : $inst->force_configure_app('Mailman', false);
266266
if($force) {
267267
swriteln('Configuring Mailman');
268268
$inst->configure_mailman();
269269
}
270270

271271
//* Check for Dovecot and Courier
272272
if(!$conf['dovecot']['installed'] && !$conf['courier']['installed']) {
273-
$conf['dovecot']['installed'] = $inst->force_configure_app('Dovecot');
274-
$conf['courier']['installed'] = $inst->force_configure_app('Courier');
273+
$conf['dovecot']['installed'] = $inst->force_configure_app('Dovecot', false);
274+
$conf['courier']['installed'] = $inst->force_configure_app('Courier', false);
275275
}
276276
//* Configure Mailserver - Dovecot or Courier
277277
if($conf['dovecot']['installed'] && $conf['courier']['installed']) {
@@ -298,21 +298,21 @@
298298
}
299299

300300
//* Configure Spamasassin
301-
$force = @($conf['spamassassin']['installed']) ? true : $inst->force_configure_app('Spamassassin');
301+
$force = @($conf['spamassassin']['installed']) ? true : $inst->force_configure_app('Spamassassin', false);
302302
if($force) {
303303
swriteln('Configuring Spamassassin');
304304
$inst->configure_spamassassin();
305305
}
306306

307307
//* Configure Amavis
308-
$force = @($conf['amavis']['installed']) ? true : $inst->force_configure_app('Amavisd');
308+
$force = @($conf['amavis']['installed']) ? true : $inst->force_configure_app('Amavisd', false);
309309
if($force) {
310310
swriteln('Configuring Amavisd');
311311
$inst->configure_amavis();
312312
}
313313

314314
//* Configure Getmail
315-
$force = @($conf['getmail']['installed']) ? true : $inst->force_configure_app('Getmail');
315+
$force = @($conf['getmail']['installed']) ? true : $inst->force_configure_app('Getmail', false);
316316
if($force) {
317317
swriteln('Configuring Getmail');
318318
$inst->configure_getmail();
@@ -322,9 +322,9 @@
322322

323323
//* Check for DNS
324324
if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
325-
$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS');
326-
$conf['bind']['installed'] = $inst->force_configure_app('BIND');
327-
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS');
325+
$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
326+
$conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
327+
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
328328
}
329329
//* Configure PowerDNS
330330
if($conf['powerdns']['installed']) {
@@ -346,23 +346,23 @@
346346
}
347347

348348
//* Configure Jailkit
349-
$force = @($conf['jailkit']['installed']) ? true : $inst->force_configure_app('Jailkit');
349+
$force = @($conf['jailkit']['installed']) ? true : $inst->force_configure_app('Jailkit', false);
350350
if($force) {
351351
swriteln('Configuring Jailkit');
352352
$inst->configure_jailkit();
353353
}
354354

355355
//* Configure Pureftpd
356-
$force = @($conf['pureftpd']['installed']) ? true : $inst->force_configure_app('pureftpd');
356+
$force = @($conf['pureftpd']['installed']) ? true : $inst->force_configure_app('pureftpd', false);
357357
if($force) {
358358
swriteln('Configuring Pureftpd');
359359
$inst->configure_pureftpd();
360360
}
361361

362362
//* Check for Web-Server
363363
if(!$conf['apache']['installed'] && !$conf['nginx']['installed']) {
364-
$conf['apache']['installed'] = $inst->force_configure_app('Apache');
365-
$conf['nginx']['installed'] = $inst->force_configure_app('nginx');
364+
$conf['apache']['installed'] = $inst->force_configure_app('Apache', false);
365+
$conf['nginx']['installed'] = $inst->force_configure_app('nginx', false);
366366
}
367367

368368
//* Configure Webserver - Apache or nginx
@@ -382,7 +382,7 @@
382382
$conf['services']['web'] = true;
383383
$conf['services']['file'] = true;
384384
//* Configure Vlogger
385-
$force = @($conf['vlogger']['installed']) ? true : $inst->force_configure_app('vlogger');
385+
$force = @($conf['vlogger']['installed']) ? true : $inst->force_configure_app('vlogger', false);
386386
if($force) {
387387
swriteln('Configuring vlogger');
388388
$inst->configure_vlogger();
@@ -406,7 +406,7 @@
406406
}
407407

408408
//* Configure XMPP
409-
$force = @($conf['xmpp']['installed']) ? true : $inst->force_configure_app('Metronome XMPP Server');
409+
$force = @($conf['xmpp']['installed']) ? true : $inst->force_configure_app('Metronome XMPP Server', false);
410410
if($force) {
411411
swriteln('Configuring Metronome XMPP Server');
412412
$inst->configure_xmpp();
@@ -415,8 +415,8 @@
415415

416416
//* Check for Firewall
417417
if(!$conf['ufw']['installed'] && !$conf['firewall']['installed']) {
418-
$conf['ufw']['installed'] = $inst->force_configure_app('Ubuntu Firewall');
419-
$conf['firewall']['installed'] = $inst->force_configure_app('Bastille Firewall');
418+
$conf['ufw']['installed'] = $inst->force_configure_app('Ubuntu Firewall', false);
419+
$conf['firewall']['installed'] = $inst->force_configure_app('Bastille Firewall', false);
420420
}
421421
//* Configure Firewall - Ubuntu or Bastille
422422
if($conf['ufw']['installed'] && $conf['firewall']['installed']) {
@@ -441,14 +441,14 @@
441441
}
442442

443443
//* Configure Fail2ban
444-
$force = @($conf['fail2ban']['installed']) ? true : $inst->force_configure_app('Fail2ban');
444+
$force = @($conf['fail2ban']['installed']) ? true : $inst->force_configure_app('Fail2ban', false);
445445
if($force) {
446446
swriteln('Configuring Fail2ban');
447447
$inst->configure_fail2ban();
448448
}
449449

450450
//* Configure OpenVZ
451-
$force = @($conf['openvz']['installed']) ? true : $inst->force_configure_app('OpenVZ');
451+
$force = @($conf['openvz']['installed']) ? true : $inst->force_configure_app('OpenVZ', false);
452452
if($force) {
453453
$conf['services']['vserver'] = true;
454454
swriteln('Configuring OpenVZ');
@@ -873,4 +873,4 @@
873873
echo "Installation completed.\n";
874874

875875

876-
?>
876+
?>

‎install/lib/installer_base.lib.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,14 @@ public function find_installed_apps() {
164164
if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;
165165
}
166166

167-
public function force_configure_app($service) {
167+
public function force_configure_app($service, $enable_force=true) {
168168
$force = false;
169169
swriteln("[WARN] autodetect for $service failed");
170-
if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
171-
// swriteln("Configure $service");
172-
$force = true;
173-
} else swriteln("Skipping $service\n");
170+
if($enable_force) {
171+
if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
172+
$force = true;
173+
} else swriteln("Skipping $service\n");
174+
}
174175
return $force;
175176
}
176177

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ CREATE TABLE `mail_forwarding` (
785785
`destination` text,
786786
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
787787
`active` enum('n','y') NOT NULL DEFAULT 'n',
788+
`greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
788789
PRIMARY KEY (`forwarding_id`),
789790
KEY `server_id` (`server_id`,`source`),
790791
KEY `type` (`type`)
@@ -928,6 +929,7 @@ CREATE TABLE `mail_user` (
928929
`move_junk` enum('n','y') NOT NULL default 'n',
929930
`custom_mailfilter` mediumtext,
930931
`postfix` enum('n','y') NOT NULL default 'y',
932+
`greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
931933
`access` enum('n','y') NOT NULL default 'y',
932934
`disableimap` enum('n','y') NOT NULL default 'n',
933935
`disablepop3` enum('n','y') NOT NULL default 'n',

‎install/tpl/fedora_amavisd_conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
4848

4949
@local_domains_maps = ( [".$mydomain"] ); # list of all local domains
5050

51-
@mynetworks = qw( 00.0.0.0/8 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
51+
@mynetworks = qw( 0.0.0.0/8 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
5252
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
5353

5454
$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ admin_notify_events=1
1818
backup_dir=/var/backup
1919
backup_dir_is_mount=y
2020
backup_mode=rootgz
21-
backup_delete=y
21+
backup_delete=n
2222
monit_url=
2323
monit_user=
2424
monit_password=

‎interface/web/vm/lib/lang/ar_openvz_template.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
9191
$wb['Template'] = 'Template';
9292
$wb['Advanced'] = 'Advanced';
9393
$wb['features_txt'] = 'Features';
94-
$wb["iptables_txt"] = "iptables";
94+
$wb["iptables_txt"] = "IP Tables";
9595
?>

‎interface/web/vm/lib/lang/ar_openvz_vm.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
3838
$wb['Virtual server'] = 'Virtual server';
3939
$wb['Advanced'] = 'Advanced';
4040
$wb['features_txt'] = 'Features';
41-
$wb["iptables_txt"] = "iptables";
41+
$wb["iptables_txt"] = "IP Tables";
4242
?>

‎interface/web/vm/lib/lang/bg_openvz_template.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
9191
$wb['Template'] = 'Template';
9292
$wb['Advanced'] = 'Advanced';
9393
$wb['features_txt'] = 'Features';
94-
$wb["iptables_txt"] = "iptables";
94+
$wb["iptables_txt"] = "IP Tables";
9595
?>

‎interface/web/vm/lib/lang/bg_openvz_vm.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
3838
$wb['Virtual server'] = 'Virtual server';
3939
$wb['Advanced'] = 'Advanced';
4040
$wb['features_txt'] = 'Features';
41-
$wb["iptables_txt"] = "iptables";
41+
$wb["iptables_txt"] = "IP Tables";
4242
?>

0 commit comments

Comments
 (0)