diff -uNrp devmon-0.3.1-beta1.paths/devmon.cfg devmon-0.3.1-beta1/devmon.cfg --- devmon-0.3.1-beta1.paths/devmon.cfg 2009-01-22 11:42:29.000000000 -0500 +++ devmon-0.3.1-beta1/devmon.cfg 2013-01-13 17:45:26.713665585 -0500 @@ -21,7 +21,7 @@ MULTINODE=NO # the display server is running on; other systems can leave this at default. # (case sensitive) [DEFAULT: /home/hobbit/server/etc/bb-hosts or # BBHOSTS environment variable set] -#BBHOSTS=/home/hobbit/server/etc/bb-hosts +#BBHOSTS=/etc/hobbit/bb-hosts # BBTAG: This is the indentifier (aka tag) that you use in your bb-hosts # which allows Devmon to determine which of the options after a host @@ -44,15 +44,15 @@ NODENAME=HOSTNAME # PIDFILE: Sets the full path to the Devmon process ID file. The directory # containing this file should be read/writable by the user running the Devmon -# process. (case sensitive) [DEFAULT: /var/run/devmon/devmon.pid] -PIDFILE=/var/run/devmon/devmon.pid +# process. (case sensitive) [DEFAULT: /run/devmon/devmon.pid] +PIDFILE=/run/devmon/devmon.pid # LOGFILE: Sets the full path to the Devmon log file. The file should either # exist and be writable by the Devmon user, or the Devmon user should have # read/write privileges to the log directory (case sensitive) # To disable logging to a file, leave this value blank (i.e. 'LOGFILE=') -# [DEFAULT: /var/log/devmon.log] -LOGFILE=/var/log/devmon.log +# [DEFAULT: /var/log/devmon/devmon.log] +LOGFILE=/var/log/devmon/devmon.log # DBHOST: Should contain the IP or DNS name of the database server # in a multinode cluster. [DEFAULT: localhost] diff -uNrp devmon-0.3.1-beta1.paths/extras/devmon.initd.redhat devmon-0.3.1-beta1/extras/devmon.initd.redhat --- devmon-0.3.1-beta1.paths/extras/devmon.initd.redhat 2009-01-22 11:42:07.000000000 -0500 +++ devmon-0.3.1-beta1/extras/devmon.initd.redhat 2013-01-13 17:44:02.132725239 -0500 @@ -4,20 +4,20 @@ # description: An snmp data collector for the hobbit & BigBrother network # monitoring suites # processname: devmon -# pidfile: /var/run/devmon/devmon.pid -# config: /usr/local/devmon/devmon.cfg +# pidfile: /run/devmon/devmon.pid +# config: /usr/share/devmon/devmon.cfg # source function library . /etc/init.d/functions RETVAL=0 -PIDFILE=/var/run/devmon/devmon.pid +PIDFILE=/run/devmon/devmon.pid KILLDELAY=5 ARGS="" -#RUNASUSER=devmon +RUNASUSER=devmon [ -e /etc/sysconfig/devmon ] && . /etc/sysconfig/devmon -prog="/usr/local/devmon/devmon" +prog="/usr/share/devmon/devmon" if [ -e ~hobbit/client/bin/bbcmd ] then prog="~hobbit/client/bin/bbcmd $prog" elif [ -e ~xymon/client/bin/bbcmd ] @@ -130,7 +130,7 @@ internal_killproc() { # Remove pid file if any. if [ -z "$killlevel" ]; then - rm -f "${pid_file:-/var/run/$base.pid}" + rm -f "${pid_file:-/run/devmon/$base.pid}" fi return $RC } diff -uNrp devmon-0.3.1-beta1.paths/modules/dm_config.pm devmon-0.3.1-beta1/modules/dm_config.pm --- devmon-0.3.1-beta1.paths/modules/dm_config.pm 2009-01-23 10:41:27.000000000 -0500 +++ devmon-0.3.1-beta1/modules/dm_config.pm 2013-01-13 17:44:40.543789969 -0500 @@ -40,8 +40,8 @@ require Exporter; # General variables 'version' => $_[0], # set in main script now 'homedir' => $FindBin::Bin, - 'configfile' => "$FindBin::Bin/devmon.cfg", - 'dbfile' => "$FindBin::Bin/hosts.db", + 'configfile' => "/etc/devmon.cfg", + 'dbfile' => "/var/lib/devmon/hosts.db", 'daemonize' => 1, 'initialized' => 0, 'mypid' => 0, @@ -121,7 +121,7 @@ require Exporter; '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{'BBHOSTS'} and $ENV{'BBHOSTS'} ne '') ? $ENV{'BBHOSTS'} : '/etc/hobbit/bb-hosts', 'regex' => '.+', 'set' => 0, 'case' => 1 }, @@ -141,11 +141,11 @@ require Exporter; 'regex' => '[\w\.-]+', 'set' => 0, 'case' => 1 }, - 'pidfile' => { 'default' => '/var/run/devmon.pid', + 'pidfile' => { 'default' => '/run/devmon/devmon.pid', 'regex' => '.+', 'set' => 0, 'case' => 1 }, - 'logfile' => { 'default' => '/var/log/devmon.log', + 'logfile' => { 'default' => '/var/log/devmon/devmon.log', 'regex' => '.*', 'set' => 0, 'case' => 1 },