From owner-freebsd-bugs@FreeBSD.ORG Thu Sep 4 14:00:48 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE3A316A4D7 for ; Thu, 4 Sep 2003 14:00:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65F1044011 for ; Thu, 4 Sep 2003 14:00:41 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h84L0cUp043748 for ; Thu, 4 Sep 2003 14:00:38 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h84L0cu0043747; Thu, 4 Sep 2003 14:00:38 -0700 (PDT) Resent-Date: Thu, 4 Sep 2003 14:00:38 -0700 (PDT) Resent-Message-Id: <200309042100.h84L0cu0043747@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0E7516A4BF; Thu, 4 Sep 2003 13:55:35 -0700 (PDT) Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id D01EF43FBD; Thu, 4 Sep 2003 13:55:34 -0700 (PDT) (envelope-from eikemeier@fillmore-labs.com) Received: from p5080bd4d.dip.t-dialin.net ([80.128.189.77] helo=fillmore-labs.com ident=08elo0c54cbj6sto) by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256) (Exim 4.22) id 19v18d-000HeC-5C; Thu, 04 Sep 2003 22:55:31 +0200 Message-Id: <3F57A6C0.2030208@fillmore-labs.com> Date: Thu, 04 Sep 2003 22:55:28 +0200 From: Oliver Eikemeier To: FreeBSD-gnats-submit@FreeBSD.org cc: "Simon L. Nielsen" cc: Sheldon Hearn cc: Tom Rhodes Subject: bin/56458: [PATCH] sysinstall: adapt exim settings to rc.subr(8) usage X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 21:00:48 -0000 >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: