* 2.0/doc/smokeping_upgrade.pod:

  + mention tSmoke inclusion
* 2.0/bin/tSmoke.dist, 2.0/Makefile:
  + make tSmoke require the current Smokeping.pm version
  + add tSmoke to the 'patch' Makefile target to keep it up to date 
* 2.0/etc/config.dist:
  + add the 'tmail' variable
* 2.0/CHANGES:
  + mention Dan as the original tSmoke author

5 files changed, 13 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index 5cab654..8c2deac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
+2005/05/31 - publish rc5 (tobi)
 * Officially include the tSmoke script from the contrib download directory.
-  Notice that this needs the new 'tmail' variable to be defined in the config file.
-  -- niko
+  Note that this needs the new 'tmail' variable to be defined in the config file.
+  -- niko, original script by Dan McGinn-Combs <d.mcginn-combs *mindspring.com>
 * Perl 5.8.0 compatibility fix ("missing max for DS uptime")
   -- niko, reported by Steve Wickert and Kennedy Clark <hkclark *gmail.com>
 * RRDtool 1.2.x compatibility fix ("unknown RRD version: 0003" on restart)
diff --git a/Makefile b/Makefile
index 80c2b81..02c1dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ doc/smokeping_examples.pod: lib/Smokeping/Examples.pm etc/config.dist
 	$(GENEX)
 patch:
 	perl -i~ -p -e 's/VERSION="\d.*?"/VERSION="$(NUMVERSION)"/' lib/Smokeping.pm 
-	perl -i~ -p -e 's/Smokeping \d.*?;/Smokeping $(NUMVERSION);/' bin/smokeping.dist htdocs/smokeping.cgi.dist
+	perl -i~ -p -e 's/Smokeping \d.*?;/Smokeping $(NUMVERSION);/' bin/smokeping.dist htdocs/smokeping.cgi.dist bin/tSmoke.dist
 
 killdoc:
 	-rm doc/*.[1357] doc/*.txt doc/*.html doc/Smokeping/* doc/Smokeping/probes/* doc/Smokeping/matchers/* doc/Config/* doc/examples/* doc/smokeping_examples.pod doc/smokeping_config.pod doc/smokeping.pod doc/smokeping.cgi.pod
diff --git a/bin/tSmoke.dist b/bin/tSmoke.dist
index e749978..d8a8089 100755
--- a/bin/tSmoke.dist
+++ b/bin/tSmoke.dist
@@ -53,7 +53,7 @@ use strict;
 use lib qw(lib);
 use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 
-use Smokeping;
+use Smokeping 1.99006;
 use Net::SMTP;
 use Getopt::Long;
 use Pod::Usage;
diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index ad7b595..046afdf 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -32,6 +32,13 @@ trial-and-error variety than it used to be. It also automates the
 generation of the configuration documentation from the source code,
 so the docs are now more accurate.
 
+A smaller change worth mentioning is the inclusion of the tSmoke script
+(contributed by Dan McGinn-Combs) for sending summary emails on daily
+and weekly system status. Note that it needs the new 'tmail' variable
+to be defined in the config file.
+
+=head2 CONFIGURATION
+
 The configuration syntax has stayed mostly the same, except for the
 issues below.
 
diff --git a/etc/config.dist b/etc/config.dist
index 71560ba..71c77ff 100644
--- a/etc/config.dist
+++ b/etc/config.dist
@@ -14,6 +14,7 @@ datadir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
 piddir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
 cgiurl   = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi
 smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
+tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist
 # specify this to get syslog logging
 syslogfacility = local0
 # each probe is now run in its own process