summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2002-08-11 14:20:15 +0000
committerPeter Palfrader <peter@palfrader.org>2002-08-11 14:20:15 +0000
commitcbf95d472c46810c36eb547de7110b460b0691a4 (patch)
treebe32b324a047e37f5de3939755371dec4e0a0f68
parent554cd7ad0a976b36bc20fdd954bcb0afa4041527 (diff)
Added /etc/echolot.conf to the list of configfiles
-rw-r--r--Echolot/Config.pm7
-rw-r--r--NEWS1
-rwxr-xr-xpingd4
3 files changed, 9 insertions, 3 deletions
diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index ee15d58..f656dae 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
package Echolot::Config;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.35 2002/08/10 01:36:47 weasel Exp $
+# $Id: Config.pm,v 1.36 2002/08/11 14:20:15 weasel Exp $
#
=pod
@@ -33,6 +33,8 @@ The configuration file is searched in those places in that order:
=item /etc/pingd.conf
+=item /etc/echolot.conf
+
=back
=cut
@@ -54,7 +56,8 @@ sub init($) {
$ENV{'HOME'}.'/echolot/pingd.conf',
$ENV{'HOME'}.'/pingd.conf',
$ENV{'HOME'}.'/.pingd.conf',
- '/etc/pingd.conf' );
+ '/etc/pingd.conf',
+ '/etc/echolot.conf' );
my $DEFAULT;
$DEFAULT = {
diff --git a/NEWS b/NEWS
index efc5970..81d9c50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
Changes in version
* Fix a few typos in the echolot.html template.
+ * Added /etc/echolot.conf to the list of configfiles.
Changes in version 2.0beta25 - 2002-08-10
* Produce echolot.html, an index file for echolot results.
diff --git a/pingd b/pingd
index 0a5fc23..633a171 100755
--- a/pingd
+++ b/pingd
@@ -3,7 +3,7 @@
$| = 1;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: pingd,v 1.57 2002/08/10 01:36:47 weasel Exp $
+# $Id: pingd,v 1.58 2002/08/11 14:20:15 weasel Exp $
#
=pod
@@ -226,6 +226,8 @@ The configuration file is searched in those places in that order:
=item /etc/pingd.conf
+=item /etc/echolot.conf
+
=back
=head1 ENVIRONMENT