updated documentation

diff --git a/spong.conf.in b/config/spong.conf.in
similarity index 89%
rename from spong.conf.in
rename to config/spong.conf.in
index 20ea0ce7c14113b6b562ea43b2cb0c80cd11b92e..a0f11a3eb25b5740c92f4930cdb68a2f9cc788fe 100644 (file)
--- a/spong.conf.in
+++ b/config/spong.conf.in
@@ -1,6 +1,7 @@
 # ---------------------------------------------------------------------------
 # Generic SPONG settings, specifies where files are kept, etc...
 # ---------------------------------------------------------------------------
+# $Id: spong.conf.in,v 1.1 2000/10/09 04:46:41 sljohnson Exp $
 
 $SPONGSLEEP           = 300;     # Sleep time between check cycles. Depreciated
 
@@ -12,7 +13,7 @@ $SPONGSLEEP{'DEFAULT'} = 300;
 # $SPONGSLEEP{'spong-server'}  = 120;  # values to override the 'DEFAULT'
 # $SPONGSLEEP{'spong-client'}  = 300;  # with the named program
 
-$SPONGSERVER         = "@@VSERVER@@";
+$SPONGSERVER         = "@@SPONGSERVER@@";
 $SPONGDB             = "@@DBDIR@@";
 $SPONGTMP            = "@@TMPDIR@@";
 $SPONG_UPDATE_PORT    = 1998;
@@ -35,11 +36,17 @@ $WWWFRAMES = 3;      # Can be 2 or 3, defaults to 2
 # Set to show long host names on Host Summary web display
 $WWW_FQDN = 1;
 
-$WWWGIFS     = "/www/gifs";
-$WWWHTML     = "@@WWWDIR@@/html";
-$WWWSPONG    = "http://@@VSERVER@@/cgi-bin/www-spong";
-$WWWACK      = "http://@@VSERVER@@/cgi-bin/www-spong-ack";
-$WWWCONTACT  = "http://@@VSERVER@@/spong/page.cgi";
+$WWWGIFS     = "/spong/gifs";               # URL to www/gifs dir
+$WWWDOCS     = "/spong/docs";               # URL to www/docs dir
+$WWWHTML     = "@@WWWDIR@@/html"; # File path to SPONG/www dir
+$WWWSPONG    = "/cgi-bin/www-spong";        # URL path to www-spong program
+$WWWACK      = "/cgi-bin/www-spong-ack";    # URL path to www-spong-ack pgm
+
+$WAPSPONG    = "/cgi-bin/wap-spong";        # URL path to wap-spong pgm
+                                            # BETA version of this feature
+
+#$WWWCONTACT  = "/spong/page.cgi";     # This CGI script is not provided. See
+                                       # the admin-guide for more infomation
 
 # Customized link(s) that can be added to the Host Display (right frame)
 #  $WWW_ACTIONBAR_CUSTOM = 
@@ -59,7 +66,7 @@ $WWW_TITLE_ACTIONBAR = ' <b>Extended ActionBar: </b> ' .
 ' || <a href="/cgi-bin/sysquery.pl?target=showall">System Summaries</a>';
 
 # This is the default of the www-spong CGI program. Possible values are
-# 'GROUPS' or 'HOST'
+# 'GROUPS' or 'HOSTS'
 $WWW_DEFAULT_VIEW = "GROUPS";
 
 # Date and time format strings. These are strftime() format variables
@@ -83,7 +90,7 @@ $WWW_COLOR{"blue"}   = "#0000ff";
 @WWW_REFRESH_DENY  = (  );
 
 # You should not have to changes these settings
-$SERVICELISTFIX = 0;   # Set his if host not displaying service status'
+$SERVICELISTFIX = 0;   # Set this if host not displaying service status
 $HOSTGROUPALL = 0;     # Set this to include the ALL group on Group Web
                        # displays
 
@@ -138,7 +145,7 @@ $CPUWARN        = 3.0;                    # Warn at load avg of 3.0
 # $LOGCRIT{"/var/log/messages"} = [ "NOTICE" ];
 
 # New Logmon configure syntax.
-#  The Syntax is must more complex that the old code, but it is inifinity more
+#  The Syntax is much more complex than the old code, but it is inifinity more
 #  configurable. 
 #
 #  The top level varable ($LOGCHECKS) is a list of anonymous hashes
@@ -189,13 +196,13 @@ $LOGCHECKS = [ { 'logfile' => '/var/log/messages',
 $HTTPDOCS{"ALL"} = [ "/index.html" ];
 $HTTPPORT{"ALL"} = 80;
 
-# $HTTPDOCS{"sprite.its.uiowa.edu"} = [ "/index.html" ];
+# $HTTPDOCS{"www3.example.com"} = [ "/index.html" ];
 
 # URL's for for http check. These configuations use HTTP 1.1 for testing.
 # The '_HOST_' string is replaced by the hostname as defined in spong.hosts.
 # The 'DEFAULT' entry is used for testing all hosts if not overriden.
 $HTTPURLS{"DEFAULT"} = [ "http://_HOST_/" ];
-$HHTPURLS{"aptest.my-inc.com"} = [ "http://_HOST_/",
+$HTTPURLS{"aptest.my-inc.com"} = [ "http://_HOST_/",
                                    "http://webtest.my-inc.com:8080/login.php3",
                                    "http://_HOST_:8000/newapp/register.html",
                                  ];

diff --git a/pod/spong-message.pod b/pod/spong-message.pod
index 443f0dc46c9f5c6df3be1198f9f3fbb018ce8385..e37cf29b435a04fade48536818b8273e6e19d105 100644 (file)
--- a/pod/spong-message.pod
+++ b/pod/spong-message.pod
@@ -265,21 +265,21 @@ Here are some examples to show you possible configurations.
 
 =over 
 
-=item spong.conf
+=item spong.hosts
 
    %HUMANS = (
       'unix-staff' => { 'name'   => 'Midrange On-call Staff',
                         'email'  => 'its-unix@school.edu'
                        },
 
-      'edhill'     => { 'name'   => 'Ed Hill',
-                        'email'  => 'ed-hill@school.edu',
+      'georgew'    => { 'name'   => 'George Wilson',
+                        'email'  => 'georgew@school.edu',
                         'skytel' => '1234567' }, 
    );
 
    %HOSTS = (
 
-     'strobe.weeg.school.edu' => { services => 'ftp smtp http',
+     'grad.cs.school.edu' =>      { services => 'ftp smtp http',
                                    'down'   => ["*:05:30-06:30",
                                                  "0:00:00-04:00" ] },
 
@@ -294,13 +294,13 @@ Here are some examples to show you possible configurations.
 
     $MESSAGING_RULES = [
 
-       { hosts => [ 'strobe.weeg.school.edu' ],
+       { hosts => [ 'gard.cs.school.edu' ],
          contacts => [ 'unix-staff'],
        },
 
        { hosts => ['www.school.edu'],
-         contacts => [ 'edhill:email',
-                       { rcpt=>'edhill:skytel', repeat=>900, }, ]
+         contacts => [ 'georgew:email',
+                       { rcpt=>'georgew:skytel', repeat=>900, }, ]
        },
 
     ];

diff --git a/src/lib/Spong/Client/plugins/check_disk b/src/lib/Spong/Client/plugins/check_disk
index 9b155a8bc9017b3f95d8f8665698a26911871010..70f1ede3d3f860e21a8760475e6d6faf2b77320d 100755 (executable)
--- a/src/lib/Spong/Client/plugins/check_disk
+++ b/src/lib/Spong/Client/plugins/check_disk
@@ -10,6 +10,8 @@ sub check_disk {
 
    open( PIPE, "$DF |" );
 
+   $message = <PIPE>;  # Header
+
  DFPIPE:
    while( <PIPE> ) {
       if( m!^(\S+)\s.*?\s(\d+)\%\s+[^/]*(/.*)$! ) {