From owner-freebsd-questions@FreeBSD.ORG Wed Feb 28 17:56:18 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 38FD816A401 for ; Wed, 28 Feb 2007 17:56:18 +0000 (UTC) (envelope-from david.robillard@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.238]) by mx1.freebsd.org (Postfix) with ESMTP id EBC2113C47E for ; Wed, 28 Feb 2007 17:56:17 +0000 (UTC) (envelope-from david.robillard@gmail.com) Received: by nz-out-0506.google.com with SMTP id r28so223936nza for ; Wed, 28 Feb 2007 09:56:17 -0800 (PST) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=J4uij0Wj98CSk62HkuWX1F14ZfawGTUxf35nZHiy+h3BulUdV1lIuPsiQ/1RizgtBpTf1N0UrkGzsWCVlaBTbqyVjfXwRYJHpKHTtJ6ABc2EFMp6LJW+/lV9AJM7mx7dJ/FnUN/p8W1rSV7ZxL5kVVUFwBJOQY3eVZdWBxHAKRg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=AWYsKBK9TKf03dkmlq8c/9LIrUTnEhRTA/iDhAxTlrcUDbnYoNVDeevOgKz3xhr6PBEK5YwdQdcO0nbNvZmxlS7ptoIuFKRWaUbpN+vrYvnl+ntlwDwHvPkRCbQE6D6jvliwZheOdXcrTr8rtrKx5Hf/nlLmheBwHTU8ggYcFvE= Received: by 10.65.23.7 with SMTP id a7mr1506384qbj.1172685377295; Wed, 28 Feb 2007 09:56:17 -0800 (PST) Received: by 10.64.210.7 with HTTP; Wed, 28 Feb 2007 09:56:17 -0800 (PST) Message-ID: <226ae0c60702280956l5b24a76bvbf6972cc33724ad@mail.gmail.com> Date: Wed, 28 Feb 2007 12:56:17 -0500 From: "David Robillard" To: "FreeBSD Questions" In-Reply-To: <934FF44E-39F5-410B-B235-5F5709B4340A@deathbeforedecaf.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <226ae0c60702261046m671647bbwc9aef6b1f6475522@mail.gmail.com> <934FF44E-39F5-410B-B235-5F5709B4340A@deathbeforedecaf.net> Cc: Rob Subject: Re: Using source control to manage system configs X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2007 17:56:18 -0000 On 2/27/07, Rob wrote: > David & Chuck, > > I'm already using RCS, and I've built a somewhat clunky mechanism > around it. > > One machine holds the master copies of > - site-wide files (/etc/ntp.conf, /etc/resolv.conf, /etc/syslog.conf) > - host-specific files (/etc/hosts, /etc/passwd, /etc/rc.conf) for > each server > > At install time, both sets of files are tarred up and copied to the > new server. If there's a conflict, the host-specific files win. > > Problem: > > It's a good system for installs, but then I update the files on the > working server. I always mean to merge the changes back to the master > copy, but it never quite happens. > > Solution: > > CVS with a remote repository looks good - updates on the server, and > a central record of all changes. Reinstalling a server should be as > easy as 'cvs co $HOST'. > > Problem: > > I don't want 6 identical copies of /etc/ntp.conf under version > control, so the site-wide files and host-specific files should be in > separate modules. But they have the same working directory, and this > is where I run into problems with CVS - it's impossible to check them > both out to the same server. > > Is there some way to do this with Subversion? Or can a file be shared > by different modules? Or am I going about this all wrong? Hi Rob, Well, I'm not quite sure that it will answer all of your questions, but take a look at Luke Kanies's article called ''Using version control in system administration''. It's available from the USENIX website at http://www.usenix.org/publications/login/2005-12/pdfs/kanies.pdf HTH, David -- David Robillard UNIX systems administrator & Oracle DBA CISSP, RHCE & Sun Certified Security Administrator Montreal: +1 514 966 0122