diff options
| author | Tar Committer <tar@ocjtech.us> | 2005-08-15 00:51:41 +0000 |
|---|---|---|
| committer | Tar Committer <tar@ocjtech.us> | 2005-08-15 00:51:41 +0000 |
| commit | c0482931956d127b5f09d4a8d72758cd4cb1f097 (patch) | |
| tree | fb13010367c3c9e3e12dc698233b729d6dd669da /etc | |
| parent | 96dc4026054df77affedfe50380a661dcdba732a (diff) | |
| download | rancid-c0482931956d127b5f09d4a8d72758cd4cb1f097.tar.gz rancid-c0482931956d127b5f09d4a8d72758cd4cb1f097.tar.xz rancid-c0482931956d127b5f09d4a8d72758cd4cb1f097.zip | |
Imported from rancid-2.3.2a3.tar.gz.rancid-2.3.2a3
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile.am | 5 | ||||
| -rw-r--r-- | etc/Makefile.in | 5 | ||||
| -rw-r--r-- | etc/rancid.conf.sample.in | 12 |
3 files changed, 15 insertions, 7 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index 8b566c0..73b3c3a 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ## A Makefile.in is supplied, in case you do not have automake. -## $Id: Makefile.am,v 1.12 2005/02/12 00:08:18 heas Exp $ +## $Id: Makefile.am,v 1.13 2005/08/14 23:35:13 heas Exp $ ## ## Copyright (C) 1997-2004 by Terrapin Communications, Inc. ## All rights reserved. @@ -70,7 +70,8 @@ auto_edit = sed \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@EXPECT_PATH\@,$(EXPECT_PATH),g' \ -e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \ - -e 's,@ENV_PATH\@,$(ENV_PATH),g' + -e 's,@ENV_PATH\@,$(ENV_PATH),g' \ + -e 's,@RCSSYS\@,$(RCSSYS),g' lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in rm -f lg.conf.sample lg.conf.sample.tmp; \ diff --git a/etc/Makefile.in b/etc/Makefile.in index de060b1..f625e2f 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -116,6 +116,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERLV = @PERLV@ PERLV_PATH = @PERLV_PATH@ PING_PATH = @PING_PATH@ +RCSSYS = @RCSSYS@ RSH = @RSH@ SENDMAIL = @SENDMAIL@ SET_MAKE = @SET_MAKE@ @@ -123,6 +124,7 @@ SHELL = @SHELL@ SORT = @SORT@ SSH = @SSH@ STRIP = @STRIP@ +SVN = @SVN@ TAR = @TAR@ TELNET = @TELNET@ TOUCH = @TOUCH@ @@ -181,7 +183,8 @@ auto_edit = sed \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@EXPECT_PATH\@,$(EXPECT_PATH),g' \ -e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \ - -e 's,@ENV_PATH\@,$(ENV_PATH),g' + -e 's,@ENV_PATH\@,$(ENV_PATH),g' \ + -e 's,@RCSSYS\@,$(RCSSYS),g' all: all-am diff --git a/etc/rancid.conf.sample.in b/etc/rancid.conf.sample.in index 2a51249..c09de01 100644 --- a/etc/rancid.conf.sample.in +++ b/etc/rancid.conf.sample.in @@ -12,20 +12,24 @@ umask 027 # Under BASEDIR (i.e.: --localstatedir), there will be a "logs" directory for # the logs from rancid and a directory for each group of routers defined in # LIST_OF_GROUPS (below). In addition to these, there will be a "CVS" -# directory which is the cvs repository. +# directory which is the cvs (or Subversion) repository. # -# Use a full path (no sym-links) for BASEDIR. Some versions of CVS seem to -# dislike sym-links. +# Use a full path (no sym-links) for BASEDIR. # TMPDIR=/tmp; export TMPDIR # Be careful changing this, it affects CVSROOT below. BASEDIR=@localstatedir@; export BASEDIR PATH=@bindir@:@ENV_PATH@; export PATH -# Location of the CVS repository. Be careful changing this. +# Location of the CVS/SVN repository. Be careful changing this. CVSROOT=$BASEDIR/CVS; export CVSROOT # Location of log files produced by rancid-run(1). LOGDIR=$BASEDIR/logs; export LOGDIR # +# Select which RCS system to use, "cvs" (default) or "svn". Do not change +# this after CVSROOT has been created with rancid-cvs. Changing between these +# requires manual conversions. +RCSSYS=@RCSSYS@; export RCSSYS +# # if NOPIPE is set, temp files will be used instead of a cmd pipe during # collection from the router(s). #NOPIPE=YES; export NOPIPE |