Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 04 Sep 2003 22:55:28 +0200
From:      Oliver Eikemeier <eikemeier@fillmore-labs.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Tom Rhodes <trhodes@FreeBSD.org>
Subject:   bin/56458: [PATCH] sysinstall: adapt exim settings to rc.subr(8) usage
Message-ID:  <3F57A6C0.2030208@fillmore-labs.com>
Resent-Message-ID: <200309042100.h84L0cu0043747@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         56458
>Category:       bin
>Synopsis:       [PATCH] sysinstall: adapt exim settings to rc.subr(8) usage
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 04 14:00:38 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 5.1-CURRENT

>Description:
Tweak some of the settings done by sysinstall in
  Configure > Networking > Mail > Exim

This is a followup to PR ports/56450:
  http://www.freebsd.org/cgi/query-pr.cgi?pr=56450
but works with earlier exim packages too.

- add 'enable_exim="YES"' to rc.conf(5)
- exim now has a default configure file in the package
- disable some more scripts that use sendmail specific parameters
- tweak mailer.conf(5) substitution
- use 'N' flag for newsyslog(8)

Thanks to all who have worked on bringing support for alternative MTAs to FreeBSD.

>How-To-Repeat:
>Fix:

--- sysinstall.patch begins here ---
--- src/usr.sbin/sysinstall/config.c.orig	Fri Aug 22 11:56:54 2003
+++ src/usr.sbin/sysinstall/config.c	Thu Sep  4 22:17:44 2003
@@ -1201,14 +1201,7 @@
     }
 
     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 @@
 		   "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 @@
 	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 @@
 		   "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);
     }
 
--- sysinstall.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F57A6C0.2030208>