Changeset 42834
- Timestamp:
- May 9, 2025, 9:11:12 AM (12 months ago)
- Location:
- trunk/ippMonitor
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
INSTALL (modified) (1 diff)
-
Makefile.in (modified) (1 diff)
-
raw/ipp.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippMonitor
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20230313/ippMonitor (added) merged: 42546,42571,42751,42819
- Property svn:mergeinfo changed
-
trunk/ippMonitor/INSTALL
r42794 r42834 39 39 # $CZARPLOTDIR and $METRICSPLOTDIR will be generated as links in the same folder as ippMonitor 40 40 # the structure of the names for these two directories are defined in Makefile.in a 41 41 42 # pltdir is for ippMetrics and czartool_plots hyperlinked from /export/ipp113.0/ipp/ in /var/www/localhost/htdocs/ippMonitor 42 43 # pltdir in ipp117 is /var/www/localhost/htdocs/ippMonitor 43 44 # ippMetrics -> /export/ipp113.0/ipp/ippMetrics/ 44 45 # czartool_plots -> /export/ipp113.0/ipp/czartool_plots/ 45 psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /var/www/localhost/htdocs/ippMonitor --site ~/ippconfig/ippmonitor.config 46 # --usePDO selects a modern PHP/mysql interface 47 psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /var/www/localhost/htdocs/ippMonitor --site ~/ippconfig/ippmonitor.config --usePDO 48 49 # note that modern php requires the use of PDO, the older MDB2 and DB mysql interfaces have been deprecated 46 50 47 51 ## NOTES: -
trunk/ippMonitor/Makefile.in
r42791 r42834 69 69 $(DESTWWW)/ipp.czartool.dat \ 70 70 $(DESTWWW)/czartool_labels.php \ 71 $(DESTWWW)/czartool_labels_old.php \72 71 $(DESTWWW)/czartool_getplot.php \ 73 72 $(DESTWWW)/czartool_exposures.php \ -
trunk/ippMonitor/raw/ipp.php
r42794 r42834 100 100 // define the DSN strings. NOTE: PDO uses a different format from DB or MDB2 101 101 if ($database == $CZARDBNAME) { 102 $dsn_pdo = "mysql:host=$ DBHOST;dbname=$database";102 $dsn_pdo = "mysql:host=$CZARDBHOST;dbname=$database"; // note this is case sensitive 103 103 $dsn = "mysql://$DBUSER:$DBPASS@$CZARDBHOST/$database"; 104 104 $dsnerr = "mysql://$DBUSER:XXX@$CZARDBHOST/$database"; // only used to report the error 105 105 } else { 106 $dsn_pdo = "mysql:host=$ CZARDBHOST;dbname=$database"; // note this is case sensitive106 $dsn_pdo = "mysql:host=$DBHOST;dbname=$database"; 107 107 $dsn = "mysql://$DBUSER:$DBPASS@$DBHOST/$database"; 108 108 $dsnerr = "mysql://$DBUSER:XXX@$DBHOST/$database"; // only used to report the error
Note:
See TracChangeset
for help on using the changeset viewer.
