IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 41730


Ignore:
Timestamp:
Jul 29, 2021, 2:53:32 PM (5 years ago)
Author:
eugene
Message:

ippMonitor scripts are now installed in a distinct location so they can be modified independently of the IPP code for both development and operations installations; disabled the "cleanTmpDirectory" option from the website

Location:
trunk/ippMonitor
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/INSTALL

    r41728 r41730  
    2323# The value also needs to match the PATH entry in ~/ippconfig/ippmonitor.config
    2424
    25 # Choose an appropriate psconfig (must exist and match PATH in ~/ippconfig/ippmonitor.config)"
    26 # It also must be built for the same O/S as the install machine"
    27 # for example:"
     25# Choose an appropriate psconfig (must exist and match PATH in ~/ippconfig/ippmonitor.config)
     26# It also must be built for the same O/S as the install machine
     27# for example:
    2828psconfig ipp-20210708-gentoo
    2929
    3030# run psconfigure to generate Makefile and raw/site.php
    31 # $CZARPLOTDIR and $METRICSPLOTDIR will be generated a link in the same folder as ippMonitor 
    32 psconfigure --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     31# DO NOT check site.php into the svn tree
     32# $CZARPLOTDIR and $METRICSPLOTDIR will be generated as links in the same folder as ippMonitor 
     33# the structure of the names for these two directories are defined in Makefile.in
     34psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --site ~/ippconfig/ippmonitor.config
    3335
    34 # copy these files and modify them (CCL removed CZARPLOTDIR)
     36## NOTES:
     37## psconfigure defines the --prefix and related options based on the psconfig system
     38## The --wwwbin option sets the location of the ippMonitor scripts. 
     39## If not specified here, this defaults to $prefix/wwwbin. 
     40## In order to keep the development and operational systems distinct, it is useful to assign the wwwbin under /var/www
     41## For an initial installation, you may need to create /var/www/localhost/wwwbin
     42
     43# Copy these files and modify them.
     44# config.dat is used to generate the site.php file installed in the htdocs location
    3545cp config.dat.in config.dat
    3646
    37 # for running czarpool.pl,
     47# czarconfig.xml is used by czarpool.pl
    3848cp czartool/czarconfig.xml.in czartool/czarconfig.xml
    3949
    … …  
    4252make
    4353
    44 # then set gnuplot path for czartool_plots and ippMetrics in ippMonitor dir
    45 # <path>/var/www/localhost/htdocs/ippMonitor/czartool_plots</path>
    46 # <savelocation>/var/www/localhost/htdocs/ippMonitor/ippMetrics</savelocation>
    47 
    4854# czarpoll.pl and roboczar.pl should be launched within 'screen' processes, traditionally
    4955# named CzarPoll and Roboczar

  • trunk/ippMonitor/Makefile.in

    r41724 r41730  
    77RAW     = raw
    88SCRIPTS = scripts
    9 DESTBIN = @BINDIR@
     9DESTBIN = @WWWBIN@
    1010DESTWWW = @HTDOCS@/ippMonitor
    1111CZARPLOTDIR = /export/@HOST2@.0/ipp/czartool_plots

  • trunk/ippMonitor/configure.tcsh

    r41126 r41730  
    1616set prefix  = ""
    1717set bindir  = ""
     18set wwwbin  = ""
    1819set libdir  = ""
    1920set datadir = ""
    … …  
    9293   endif
    9394   breaksw;
     95  case --wwwbin*
     96   if ("$1" == "--wwwbin") then
     97     shift
     98     set wwwbin = $1
     99   else
     100     set wwwbin = `echo $1 | tr = ' ' | awk '{print $2}'`
     101   endif
     102   breaksw;
    94103  case --libdir*
    95104   if ("$1" == "--libdir") then
    … …  
    139148echo "prefix: $prefix"
    140149echo "bindir: $bindir"
     150echo "wwwbin: $wwwbin"
    141151echo "libdir: $libdir"
    142152echo "datadir:$datadir"
    … …  
    160170endif
    161171
     172# BINDIR holds the output binary files
     173if ("$wwwbin" == "") then
     174  if ("$prefix" == "") goto usage
     175  set wwwbin = $prefix/wwwbin
     176endif
     177
    162178# LIBDIR set the install lib directory
    163179if ("$libdir" == "") then
    … …  
    182198# convert Makefile.in to Makefile:
    183199if (-e Makefile) mv -f Makefile Makefile~
    184 cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
     200cat Makefile.in | sed "s|@HTDOCS@|$htdocs|"    > tmp.1
    185201cat tmp.1       | sed "s|@HOST2@|$hostname2|"  > tmp.2
    186 cat tmp.2       | sed "s|@BINDIR@|$bindir|" > Makefile
    187 rm -f tmp.2
     202cat tmp.2       | sed "s|@BINDIR@|$bindir|"    > tmp.1
     203cat tmp.1       | sed "s|@WWWBIN@|$wwwbin|"    > Makefile
     204rm -f tmp.1 tmp.2
    188205
    189206# convert raw/site.php.in to raw/site.php
    190207if (-e raw/site.php) mv -f raw/site.php raw/site.php~
    191 cat raw/site.php.in | sed "s|@BINDIR@|$bindir|"  > tmp.2
     208cat raw/site.php.in | sed "s|@BINDIR@|$bindir|"  > tmp.1
     209cat tmp.1           | sed "s|@WWWBIN@|$wwwbin|"  > tmp.2
    192210cat tmp.2           | sed "s|@LIBDIR@|$libdir|"  > tmp.1
    193211cat tmp.1           | sed "s|@PERLLIB@|$libdir|" > tmp.2
    … …  
    232250  --useMDB2              use MDB2 interface instead of DB
    233251
    234   --bindir=DIR           user executables [PREFIX/bin/$ARCH]
     252  --bindir=DIR           IPP main executables [PREFIX/bin]
     253  --wwwbin=DIR           ippMonitor executables [PREFIX/wwwbin]
    235254  --libdir=DIR           object code libraries [PREFIX/lib/$ARCH]
    236255  --datadir=DIR          read-only architecture-independent data [PREFIX/share]

  • trunk/ippMonitor/raw/cleanTmpDirectory.php

    r28608 r41730  
    1414
    1515
    16 exec("find /tmp -user apache", $output, $status);
     16echo "This function has been deprecated (EAM 2021.07.28)\n";
    1717
    18 echo "<html><body>\n";
    19 echo "Cleaning /tmp file (removing all files belonging to user apache)<br><br>\n";
    20 $count = 0;
    21 foreach ($output as $key => $value) {
    22   echo "Deleting [$value]<br>\n";
    23   exec("rm -f $value");
    24   $count++;
     18if (0) {
     19   exec("find /tmp -user apache", $output, $status);
     20
     21   echo "<html><body>\n";
     22   echo "Cleaning /tmp file (removing all files belonging to user apache)<br><br>\n";
     23   $count = 0;
     24   foreach ($output as $key => $value) {
     25     echo "Deleting [$value]<br>\n";
     26     exec("rm -f $value");
     27     $count++;
     28   }
     29   echo "<br>/tmp cleaned ($count files were deleted)<br>\n";
    2530}
    26 echo "<br>/tmp cleaned ($count files were deleted)<br>\n";
    2731echo "</body></html>\n";
    28 
    2932
    3033menu_end();

  • trunk/ippMonitor/raw/columns_in_db.php

    r39498 r41730  
    117117                     );
    118118
    119 echo "<b>This script does not do anything but showing the current columns in the various db tables</b><br/><br/>";
     119echo "<b>This script does not do anything but show the current columns in the various db tables</b><br/><br/>";
    120120
    121121foreach ($tableNames as $tIndex => $tableName) {

  • trunk/ippMonitor/raw/czartool_exposures.php

    r39498 r41730  
    99
    1010$PATH = getenv("PATH");
    11 putenv("PATH=$BINDIR:$PATH");
     11putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    1212
    1313$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/czartool_ipptopsps.php

    r39498 r41730  
    1616
    1717$PATH = getenv("PATH");
    18 putenv("PATH=$BINDIR:$PATH");
     18putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    1919
    2020$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/czartool_labels.php

    r41678 r41730  
    1515
    1616$PATH = getenv("PATH");
    17 putenv("PATH=$BINDIR:$PATH");
     17putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    1818
    1919$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");
    … …  
    203203
    204204// status table at top
     205// XXX hard-wired path: BAD
    205206exec("svnversion /data/ippc64.1/ippitc/ippMonitor", $svnversion);
    206207$phpversion = phpversion();

  • trunk/ippMonitor/raw/czartool_servers.php

    r39805 r41730  
    2727
    2828$PATH = getenv("PATH");
    29 putenv("PATH=$BINDIR:$PATH");
     29putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    3030
    3131$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/getimage.php

    r40434 r41730  
    2020putenv("PERL5LIB=$PERLLIB:");
    2121$PATH = getenv("PATH");
    22 putenv("PATH=$BINDIR:$PATH");
     22putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    2323putenv("NEB_SERVER=$NEB_SERVER");
    2424

  • trunk/ippMonitor/raw/getlog.php

    r13241 r41730  
    1515putenv("PERL5LIB=$PERLLIB:");
    1616$PATH = getenv("PATH");
    17 putenv("PATH=$BINDIR:$PATH");
     17putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    1818
    1919# echo "args: $args<br>";

  • trunk/ippMonitor/raw/histogram.php

    r39498 r41730  
    408408//Get environment
    409409$PATH = getenv("PATH");
    410 putenv("PATH=$BINDIR:$PATH");
     410putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    411411$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");
    412412putenv("LD_LIBRARY_PATH=$LIBDIR:$LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/ipp.php

    r41126 r41730  
    829829    global $NEB_SERVER;
    830830    global $BINDIR;
     831    global $WWWBIN;
    831832    global $SITE;
    832833    putenv("PERL5LIB=$PERLLIB:");
    833834
    834835    $PATH = getenv("PATH");
    835     putenv("PATH=$BINDIR:$PATH");
     836    putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    836837    putenv("NEB_SERVER=$NEB_SERVER");
    837838

  • trunk/ippMonitor/raw/plotHistogram.php

    r28601 r41730  
    1717
    1818$PATH = getenv("PATH");
    19 putenv("PATH=$BINDIR:$PATH");
     19putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    2020
    2121$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/scatterPlot.php

    r28601 r41730  
    1717
    1818$PATH = getenv("PATH");
    19 putenv("PATH=$BINDIR:$PATH");
     19putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    2020
    2121$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/show_log.php

    r37983 r41730  
    1111putenv("PERL5LIB=$PERLLIB:");
    1212$PATH = getenv("PATH");
    13 putenv("PATH=$BINDIR:$PATH");
     13putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    1414
    1515$basename = $_GET[basename];

  • trunk/ippMonitor/raw/site.php.in

    r41135 r41730  
    88$PERLLIB    = "@PERLLIB@";
    99$BINDIR     = "@BINDIR@";
     10$WWWBIN     = "@WWWBIN@";
    1011$LIBDIR     = "@LIBDIR@";
    1112$SITE       = "@SITE@";
     13
     14// $BINDIR : general IPP code needed by ippMonitor
     15// $WWWBIN : ippMonitor programs in scripts are installed here
    1216
    1317$DBI     = "@DBI@";

  • trunk/ippMonitor/raw/skycellplot.php

    r34432 r41730  
    1818
    1919$PATH = getenv("PATH");
    20 putenv("PATH=$BINDIR:$PATH");
     20putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    2121
    2222$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");

  • trunk/ippMonitor/raw/skyplot.php

    r40437 r41730  
    2828
    2929$PATH = getenv("PATH");
    30 putenv("PATH=$BINDIR:$PATH");
     30putenv("PATH=$WWWBIN:$BINDIR:$PATH");
    3131
    3232$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");
Note: See TracChangeset for help on using the changeset viewer.