summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/config.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index aa8d677..55411c1 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -1201,14 +1201,7 @@ configMTAExim(dialogMenuItem *self)
}
variable_set2(VAR_SENDMAIL_ENABLE, "NONE", 1);
-
- if(file_readable("/usr/local/etc/exim/configure.default") &&
- !file_readable("/usr/local/etc/exim/configure")) {
- if(vsystem("cp /usr/local/etc/exim/configure.default /usr/local/etc/exim/configure"))
- msgConfirm("An error occurred while coping the exim configuration file.\n"
- "Please check if exim is working after you have completed this\n"
- "installation.\n");
- }
+ variable_set2("exim_enable", "YES", 1);
/* Update periodic.conf */
perconf = fopen("/etc/periodic.conf", "a");
@@ -1221,7 +1214,10 @@ configMTAExim(dialogMenuItem *self)
"fix this.");
} else {
fprintf(perconf, "# --- Generated by sysinstall ---\n");
+ fprintf(perconf, "daily_clean_hoststat_enable=\"NO\"\n");
fprintf(perconf, "daily_status_include_submit_mailq=\"NO\"\n");
+ fprintf(perconf, "daily_status_mail_rejects_enable=\"NO\"\n");
+ fprintf(perconf, "daily_submit_queuerun=\"NO\"\n");
fclose(perconf);
}
@@ -1240,8 +1236,10 @@ configMTAExim(dialogMenuItem *self)
fprintf(mailerconf, "#\n");
fprintf(mailerconf, "sendmail /usr/local/sbin/exim\n");
fprintf(mailerconf, "send-mail /usr/local/sbin/exim\n");
- fprintf(mailerconf, "mailq /usr/local/sbin/exim -bp\n");
- fprintf(mailerconf, "newaliases /usr/bin/true\n");
+ fprintf(mailerconf, "mailq /usr/local/sbin/exim\n");
+ fprintf(mailerconf, "newaliases /usr/local/sbin/exim -bi\n");
+ fprintf(mailerconf, "hoststat /usr/bin/true\n");
+ fprintf(mailerconf, "purgestat /usr/bin/true\n");
fclose(mailerconf);
}
@@ -1255,8 +1253,8 @@ configMTAExim(dialogMenuItem *self)
"rotate the logfiles.");
} else {
fprintf(newsyslogconf, "# --- Generated by sysinstall ---\n");
- fprintf(newsyslogconf, "/var/log/exim/mainlog mailnull:mail 640 7 * @T00 Z\n");
- fprintf(newsyslogconf, "/var/log/exim/rejectlog mailnull:mail 640 7 * @T00 Z\n");
+ fprintf(newsyslogconf, "/var/log/exim/mainlog mailnull:mail 640 7 * @T00 ZN\n");
+ fprintf(newsyslogconf, "/var/log/exim/rejectlog mailnull:mail 640 7 * @T00 ZN\n");
fclose(newsyslogconf);
}
OpenPOWER on IntegriCloud