[Devmon-devel] SF.net SVN: devmon:[254] trunk

[<buc...@us...>]

Revision: 254
          http://sourceforge.net/p/devmon/code/254
Author:   buchanmilne
Date:     2016-03-11 11:45:44 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
Support Xymon 4.3 by default without requiring compat variables

Modified Paths:
--------------
    trunk/extras/devmon.initd.redhat
    trunk/modules/dm_config.pm

Modified: trunk/extras/devmon.initd.redhat
===================================================================
--- trunk/extras/devmon.initd.redhat	2016-01-08 10:18:59 UTC (rev 253)
+++ trunk/extras/devmon.initd.redhat	2016-03-11 11:45:44 UTC (rev 254)
@@ -26,7 +26,11 @@
 [ -e /etc/sysconfig/devmon ] && . /etc/sysconfig/devmon
 
 prog="/usr/local/devmon/devmon"
-if [ -e ~hobbit/client/bin/bbcmd ]
+if [ -e ~xymon/server/bin/xymoncmd ]
+then prog="~xymon/server/bin/xymoncmd $prog"
+elif [ -e ~xymon/client/bin/xymoncmd ]
+then prog="~xymon/client/bin/xymoncmd $prog"
+elif [ -e ~hobbit/client/bin/bbcmd ]
 then prog="~hobbit/client/bin/bbcmd $prog"
 elif [ -e ~xymon/client/bin/bbcmd ]
 then prog="~xymon/client/bin/bbcmd $prog"

Modified: trunk/modules/dm_config.pm
===================================================================
--- trunk/modules/dm_config.pm	2016-01-08 10:18:59 UTC (rev 253)
+++ trunk/modules/dm_config.pm	2016-03-11 11:45:44 UTC (rev 254)
@@ -122,11 +122,11 @@
                        'regex'   => 'yes|no',
                        'set'     => 0,
                        'case'    => 0 },
-      'bbhosts'   => { 'default' => (defined $ENV{'BBHOSTS'} and $ENV{'BBHOSTS'} ne '') ? $ENV{'BBHOSTS'} : '/home/hobbit/server/etc/bb-hosts',
+      'bbhosts'   => { 'default' => (defined $ENV{'HOSTSCFG'} and $ENV{'HOSTSCFG'} ne '') ? $ENV{'HOSTSCFG'} :(defined $ENV{'BBHOSTS'} and $ENV{'BBHOSTS'} ne '') ? $ENV{'BBHOSTS'} : '/home/hobbit/server/etc/bb-hosts',
                        'regex'   => '.+',
                        'set'     => 0,
                        'case'    => 1 },
-      'bblocation'     => { 'default' => (defined $ENV{'BBLOCATION'} and $ENV{'BBLOCATION'} ne '') ? $ENV{'BBLOCATION'} : '',
+      'bblocation'     => { 'default' => (defined $ENV{'XYMONNETWORK'} and $ENV{'XYMONNETWORK'} ne '') ? $ENV{'XYMONNETWORK'} : (defined $ENV{'BBLOCATION'} and $ENV{'BBLOCATION'} ne '') ? $ENV{'BBLOCATION'} : '',
                        'regex'   => '\w+',
                        'set'     => 0,
                        'case'    => 1 },
@@ -174,15 +174,15 @@
                          'regex'   => 'bb|hobbit|xymon',
                          'set'     => 0,
                          'case'    => 0 },
-      'dispserv'    => { 'default' => (defined $ENV{'BBDISP'} and $ENV{BBDISP} ne '') ? $ENV{'BBDISP'} : 'localhost',
+      'dispserv'    => { 'default' => (defined $ENV{'XYMSRV'} and $ENV{'XYMSRV'} ne '' ) ? $ENV{'XYMSRV'} : (defined $ENV{'BBDISP'} and $ENV{BBDISP} ne '') ? $ENV{'BBDISP'} : 'localhost',
                          'regex'   => '\S+',
                          'set'     => 0,
                          'case'    => 0 },
-      'dispport'    => { 'default' => (defined $ENV{'BBPORT'} and $ENV{'BBPORT'} ne '') ? $ENV{'BBPORT'} :  1984,
+      'dispport'    => { 'default' => (defined $ENV{'XYMONDPORT'} and $ENV{'XYMONDPORT'} ne '') ? $ENV{'XYMONDPORT'} : (defined $ENV{'BBPORT'} and $ENV{'BBPORT'} ne '') ? $ENV{'BBPORT'} :  1984,
                          'regex'   => '\d+',
                          'set'     => 0,
                          'case'    => 0 },
-      'bbdateformat' => { 'default' => (defined $ENV{'BBDATEFORMAT'} and $ENV{'BBDATEFORMAT'} ne '') ? $ENV{'BBDATEFORMAT'} : '',
+      'bbdateformat' => { 'default' => (defined $ENV{'XYMONDATEFORMAT'} and $ENV{'XYMONDATEFORMAT'} ne '') ? $ENV{'XYMONDATEFORMAT'} : (defined $ENV{'BBDATEFORMAT'} and $ENV{'BBDATEFORMAT'} ne '') ? $ENV{'BBDATEFORMAT'} : '',
                          'regex'   => '.+',
                          'set'     => 0,
                          'case'    => 1 },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.