Imported from rancid-2.3.tar.gz.rancid-2.3

3 files changed, 28 insertions, 7 deletions

diff --git a/etc/Makefile.am b/etc/Makefile.am
index e44e781..10edcad 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.10 2004/01/11 03:43:50 heas Exp $
+## $Id: Makefile.am,v 1.11 2004/01/13 18:02:00 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -28,8 +28,13 @@ EXTRA_DIST= $(pkgdata_DATA:%=%.in)
 
 CLEANFILES= $(pkgdata_DATA)
 
+if CONF_INSTALL
+DO_CONF_INSTALL=yes
+endif
+
 install-data-local: all
-	@if test -f $(sysconfdir)/rancid.conf ; then \
+	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
+	if test -f $(sysconfdir)/rancid.conf ; then \
 	    echo ""; \
 	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
 	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
@@ -46,7 +51,8 @@ install-data-local: all
 	    echo ""; \
 	else \
 	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
-	fi;
+	fi; \
+	fi
 
 #clean:
 #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 7a52e35..0c1a0ba 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -63,6 +63,8 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 COMM = @COMM@
+CONF_INSTALL_FALSE = @CONF_INSTALL_FALSE@
+CONF_INSTALL_TRUE = @CONF_INSTALL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CVS = @CVS@
@@ -95,6 +97,8 @@ MAILPLUS = @MAILPLUS@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
+MK_LCLSTATEDIR_FALSE = @MK_LCLSTATEDIR_FALSE@
+MK_LCLSTATEDIR_TRUE = @MK_LCLSTATEDIR_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -151,6 +155,7 @@ AUTOMAKE_OPTIONS = foreign
 pkgdata_DATA = lg.conf.sample rancid.conf.sample
 EXTRA_DIST = $(pkgdata_DATA:%=%.in)
 CLEANFILES = $(pkgdata_DATA)
+@CONF_INSTALL_TRUE@DO_CONF_INSTALL = yes
 
 #clean:
 #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
@@ -342,7 +347,8 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA
 
 
 install-data-local: all
-	@if test -f $(sysconfdir)/rancid.conf ; then \
+	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
+	if test -f $(sysconfdir)/rancid.conf ; then \
 	    echo ""; \
 	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
 	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
@@ -359,7 +365,8 @@ install-data-local: all
 	    echo ""; \
 	else \
 	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
-	fi;
+	fi; \
+	fi
 
 lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
 	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/etc/rancid.conf.sample.in b/etc/rancid.conf.sample.in
index c550c74..8cc1b09 100644
--- a/etc/rancid.conf.sample.in
+++ b/etc/rancid.conf.sample.in
@@ -5,6 +5,10 @@
 #
 TERM=network;export TERM
 #
+# Create files w/o world read/write/exec permissins, but read/exec permissions
+# for group.
+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"
@@ -53,7 +57,11 @@ OLDTIME=4; export OLDTIME
 # For each group, define a list of people to receive the diffs.
 # in sendmail's /etc/aliases.
 #   rancid-group:	joe,moe@foo
-#   rancid-group-admin:	hostmaster
+#   rancid-admin-group:	hostmaster
 # be sure to read ../README regarding aliases.
 #
-umask 027
+# If your MTA configuration is broken or you want mail to be forwarded to a
+# domain not the same the local one, define that domain here.  "@" must be
+# included, as this is simply appended to the usual recipients.  It is NOT
+# appended to recipients specified in rancid-run's -m option.
+#MAILDOMAIN="@example.com"; export MAILDOMAIN