From owner-cvs-src@FreeBSD.ORG Thu Aug 31 00:16:02 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E638F16A4DA; Thu, 31 Aug 2006 00:16:01 +0000 (UTC) (envelope-from gad@FreeBSD.org) Received: from smtp7.server.rpi.edu (smtp7.server.rpi.edu [128.113.2.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7829343D46; Thu, 31 Aug 2006 00:16:01 +0000 (GMT) (envelope-from gad@FreeBSD.org) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp7.server.rpi.edu (8.13.1/8.13.1) with ESMTP id k7V0Fxsn031760; Wed, 30 Aug 2006 20:16:00 -0400 Mime-Version: 1.0 Message-Id: In-Reply-To: <20060830202834.GA11284@rambler-co.ru> References: <200608290920.k7T9KmV9067843@repoman.freebsd.org> <86zmdmfoow.fsf@dwp.des.no> <20060830202834.GA11284@rambler-co.ru> Date: Wed, 30 Aug 2006 20:15:57 -0400 To: Ruslan Ermilov From: Garance A Drosehn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-CanItPRO-Stream: default X-RPI-SA-Score: undef - spam-scanning disabled X-Scanned-By: CanIt (www . canit . ca) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: "Chatty" config files in /etc X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2006 00:16:02 -0000 At 12:28 AM +0400 8/31/06, Ruslan Ermilov wrote: >On Wed, Aug 30, 2006 at 01:41:51PM -0400, Garance A Drosehn wrote: > > > ... I wonder if it would be better to > > have the comments and examples as files under /etc/defaults. I > > suppose they could also go under /usr/share/examples, but for > > these files I think there is some advantage that the comments > > and examples be on '/', and not on '/usr'. > > >> Also, if the comment+example files are under /etc/defaults, then >> changes to them *will* come up in mergemaster. It's just that >> now they will show up in a file that has no local changes, so >> the user can just read the change, instead of having to "merge" > > all their local changes with the new official version. > >I think they should be moved to /usr/share/examples/etc/ (like >make.conf), with files in /etc/ representing good (short) defaults >with a minimum of comments and probably references to examples. Well, my thinking was something like: a) these example/comment files are for "system" things. Many people mount their /usr directories from somewhere else, thus /usr might not be an exact match for the running kernel. (note that make.conf makes sense for /usr/share/examples, because the `make` command is also under /usr). b) by putting them in /etc/defaults, users do *see* the changes when they run mergemaster, even though they won't have to merge those changes with local changes. In some cases the changes to the comments or examples will suggest some change that the user should be making to their own already-working configuration, even though their configuration won't match the default system-config. I'm thinking when some comment is added like: # NOTE: Please see pf.conf(5) BUGS section before # using user/group rules. As a sysadmin, I do not stop and read every man page when it changes. But if I see a comment like that added to pf.conf when I run mergemaster, then I *will* take the time to read pf.conf(5) to see what this (possibly new) issue is. So the file we install as /etc/pf.conf could easily be changed to: # $FreeBSD: src/etc/pf.conf,v 1.---- 2006/04/04 20:31:20 mlaier Exp $ # # See pf.conf(5) for syntax, and /etc/defaults/pf.conf for a detailed # example of this file. The directory /usr/share/examples/pf contains # some additional example configurations. # Required order: options, normalization, queueing, translation, filtering. # Macros and tables may be defined and used anywhere. # Note: translation rules are first match while filter rules are last match. # Filtering: the implicit first two rules are #pass in all #pass out all ...... and that's all. Just a 13-line file, with almost no specific details in it. The few comments that are left are ones which would always be helpful to have there as reminders, and which are not likely to change over time. With any luck, we should be able to go a few years without changing this file. -- Garance Alistair Drosehn = drosehn@rpi.edu Senior Systems Programmer or gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA