View | Details | Raw Unified | Return to bug 56458
Collapse All | Expand All

(-)src/usr.sbin/sysinstall/config.c (-12 / +10 lines)
Lines 1201-1214 Link Here
1201
    }
1201
    }
1202
1202
1203
    variable_set2(VAR_SENDMAIL_ENABLE, "NONE", 1);
1203
    variable_set2(VAR_SENDMAIL_ENABLE, "NONE", 1);
1204
1204
    variable_set2("exim_enable", "YES", 1);
1205
    if(file_readable("/usr/local/etc/exim/configure.default") &&
1206
	!file_readable("/usr/local/etc/exim/configure")) {
1207
	if(vsystem("cp /usr/local/etc/exim/configure.default /usr/local/etc/exim/configure"))
1208
	    msgConfirm("An error occurred while coping the exim configuration file.\n"
1209
		       "Please check if exim is working after you have completed this\n"
1210
		       "installation.\n");
1211
    }
1212
1205
1213
    /* Update periodic.conf */
1206
    /* Update periodic.conf */
1214
    perconf = fopen("/etc/periodic.conf", "a");
1207
    perconf = fopen("/etc/periodic.conf", "a");
Lines 1221-1227 Link Here
1221
		   "fix this.");
1214
		   "fix this.");
1222
    } else {
1215
    } else {
1223
	fprintf(perconf, "# --- Generated by sysinstall ---\n");
1216
	fprintf(perconf, "# --- Generated by sysinstall ---\n");
1217
	fprintf(perconf, "daily_clean_hoststat_enable=\"NO\"\n");
1224
	fprintf(perconf, "daily_status_include_submit_mailq=\"NO\"\n");
1218
	fprintf(perconf, "daily_status_include_submit_mailq=\"NO\"\n");
1219
	fprintf(perconf, "daily_status_mail_rejects_enable=\"NO\"\n");
1220
	fprintf(perconf, "daily_submit_queuerun=\"NO\"\n");
1225
	fclose(perconf);
1221
	fclose(perconf);
1226
    }
1222
    }
1227
1223
Lines 1240-1247 Link Here
1240
	fprintf(mailerconf, "#\n");
1236
	fprintf(mailerconf, "#\n");
1241
	fprintf(mailerconf, "sendmail	/usr/local/sbin/exim\n");
1237
	fprintf(mailerconf, "sendmail	/usr/local/sbin/exim\n");
1242
	fprintf(mailerconf, "send-mail	/usr/local/sbin/exim\n");
1238
	fprintf(mailerconf, "send-mail	/usr/local/sbin/exim\n");
1243
	fprintf(mailerconf, "mailq		/usr/local/sbin/exim -bp\n");
1239
	fprintf(mailerconf, "mailq		/usr/local/sbin/exim\n");
1244
	fprintf(mailerconf, "newaliases	/usr/bin/true\n");
1240
	fprintf(mailerconf, "newaliases	/usr/local/sbin/exim -bi\n");
1241
	fprintf(mailerconf, "hoststat	/usr/bin/true\n");
1242
	fprintf(mailerconf, "purgestat	/usr/bin/true\n");
1245
	fclose(mailerconf);
1243
	fclose(mailerconf);
1246
    }
1244
    }
1247
1245
Lines 1255-1262 Link Here
1255
		   "rotate the logfiles.");
1253
		   "rotate the logfiles.");
1256
    } else {
1254
    } else {
1257
	fprintf(newsyslogconf, "# --- Generated by sysinstall ---\n");
1255
	fprintf(newsyslogconf, "# --- Generated by sysinstall ---\n");
1258
	fprintf(newsyslogconf, "/var/log/exim/mainlog	mailnull:mail	640  7	   *	@T00  Z\n");
1256
	fprintf(newsyslogconf, "/var/log/exim/mainlog	mailnull:mail	640  7	   *	@T00  ZN\n");
1259
	fprintf(newsyslogconf, "/var/log/exim/rejectlog	mailnull:mail	640  7	   *	@T00  Z\n");
1257
	fprintf(newsyslogconf, "/var/log/exim/rejectlog	mailnull:mail	640  7	   *	@T00  ZN\n");
1260
	fclose(newsyslogconf);
1258
	fclose(newsyslogconf);
1261
    }
1259
    }

Return to bug 56458