Changeset 695

Show
Ignore:
Timestamp:
01/08/08 11:09:19 (1 year ago)
Author:
ton
Message:

Create necessary dirs at install_slave time. opsview_housekeep
will not error if dirs missing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/DEV-2.11/opsview-core/bin/install_slave

    r655 r695  
    8484        chmod 0755, "$nagios_dir/var" or die "Cannot chmod"; 
    8585        chown $nagios_id, $nagios_gid, "$nagios_dir/var"; 
     86} 
     87if (! -d "$nagios_dir/var/rrd") { 
     88        mkdir "$nagios_dir/var/rrd" or die "Cannot create $nagios_dir/var/rrd"; 
     89        chmod 0755, "$nagios_dir/var/rrd" or die "Cannot chmod"; 
     90        chown $nagios_id, $nagios_gid, "$nagios_dir/var/rrd"; 
     91} 
     92if (! -d "$nagios_dir/var/archives") { 
     93        mkdir "$nagios_dir/var/archives" or die "Cannot create $nagios_dir/var/archives"; 
     94        chmod 0775, "$nagios_dir/var/archives" or die "Cannot chmod"; 
     95        chown $nagios_id, $nagios_gid, "$nagios_dir/var/archives"; 
    8696} 
    8797if (! -d "$nagios_dir/etc") { 
  • branches/DEV-2.11/opsview-core/bin/opsview_housekeep

    r680 r695  
    4646do "housekeep.cfg" || die "Cannot read housekeep.cfg"; 
    4747 
    48 if(! -d "$rootdir/var/archives" ) { 
    49         mkdir("$rootdir/var/archives", 0775)  
    50                 or die "Cannot create log archive directory"; 
     48if (-d "$rootdir/var/archives") { 
     49        system("find","$rootdir/var/archives","-mtime","+$archive_retention_days","-exec","rm",'{}',';') == 0 or die "Error deleting nagios archives"; 
    5150} 
    52  
    53 if(! -d "$rootdir/var/rrd" ) { 
    54         mkdir("$rootdir/var/rrd", 0775)  
    55                 or die "Cannot create rrd directory"; 
     51if (-d "$rootdir/var/rrd") { 
     52        system("find","$rootdir/var/rrd","-mtime","+$rrd_retention_days","-exec","rm","{}",";") == 0 or die "Error deleting unused rrd files"; 
    5653} 
    57  
    58 system("find","$rootdir/var/archives","-mtime","+$archive_retention_days","-exec","rm",'{}',';') == 0 or die "Error deleting nagios archives"; 
    59 system("find","$rootdir/var/rrd","-mtime","+$rrd_retention_days","-exec","rm","{}",";") == 0 or die "Error deleting unused rrd files"; 
    6054 
    6155if (-e $dbfile) {