Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:illuusio
wview
wview-0001-directories-5.20.2.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File wview-0001-directories-5.20.2.diff of Package wview
Binääritiedostot wview-5.20.2/alarms/sample-datafeed-client/datafeedClient ja wview-5.20.2-patch/alarms/sample-datafeed-client/datafeedClient eroavat Binääritiedostot wview-5.20.2/alarms/sample-datafeed-client/datafeedClient.o ja wview-5.20.2-patch/alarms/sample-datafeed-client/datafeedClient.o eroavat diff -urN wview-5.20.2/alarms/sample-datafeed-client/Makefile wview-5.20.2-patch/alarms/sample-datafeed-client/Makefile --- wview-5.20.2/alarms/sample-datafeed-client/Makefile 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/alarms/sample-datafeed-client/Makefile 2013-03-12 10:04:47.000000000 +0200 @@ -39,7 +39,7 @@ -lsqlite3 \ -lrad -LIBPATH = -L/usr/lib -L/usr/local/lib +LIBPATH = -L/usr/lib -L/usr/lib # Declare build defines DEFINES = \ @@ -49,7 +49,7 @@ INCLUDES = \ -I. \ -I../../common \ - -I/usr/local/include + -I/usr/include ########################### T A R G E T I N F O ############################ EXE_IMAGE = datafeedClient diff -urN wview-5.20.2/ChangeLog wview-5.20.2-patch/ChangeLog --- wview-5.20.2/ChangeLog 2012-03-21 14:54:18.000000000 +0200 +++ wview-5.20.2-patch/ChangeLog 2013-03-12 10:04:34.000000000 +0200 @@ -735,7 +735,7 @@ 4) Fixed a bug in htmlHistoryInit which caused the wview-history.sdb database to be filled with NULL records if there was no archive history available. Simply - delete the $prefix/var/wview/archive/wview-history.sdb file and restart wview. + delete the /var/lib/wview/archive/wview-history.sdb file and restart wview. 5) Cleaned up the debian package generation control files including making "radlib-dev" a prerequisite for wview. APT upgrades of the 5.8.0 package @@ -761,7 +761,7 @@ 4) Removed use of the HTTP_DOC_ROOT environment variable. Now the install location for wviewmgmt will be $(localstatedir)/wviewmgmt. Soft links can be used to make this visible in the http server document root as desired. - $(localstatedir) is /usr/local/var by default. + $(localstatedir) is /var by default. 5) Added new configuration database creation script for debian package installations. It is used by the debian package post-installation script. @@ -1080,7 +1080,7 @@ defined prior to invocation of the configure script, the install-env target will install wviewmgmt to the http document root specified. -3) Updated the install-env target for wview build so the $prefix/var/wview/archive +3) Updated the install-env target for wview build so the /var/lib/wview/archive directory is NOT replaced, but rather updated. This means your existing archive database should be preserved and will not require a manual copy from the save directory after the installation. @@ -1104,7 +1104,7 @@ 1) Changed station build procedure so all station binaries are built with unique names such as wviewd_vpro, wviewd_wxt510, etc. Modified the wviewmgmt and wviewconfig configuration utilities to populate the file - $prefix/etc/wview/wview-binary with the appropriate wviewd binary name; + /etc/wview/wview-binary with the appropriate wviewd binary name; changed all start scripts to use the contents of this file when starting. 2) Moved the ConfigForms directory out of $distro/examples to $distro/wviewmgmt @@ -1176,7 +1176,7 @@ to your web server document root. The entry point is /ConfigForms/wview-form.php. Hooks were included for parameter value checking but for now whatever you enter is what gets put in the wview-conf.sdb database. - A link to $prefix/etc/wview/wview-conf.sdb must be placed in the /ConfigForms + A link to /etc/wview/wview-conf.sdb must be placed in the /ConfigForms directory with proper rw permissions. 2) Added new database to store HILOW data, wview-hilow.sdb. Hourly highs and lows @@ -1237,7 +1237,7 @@ regenerate the sensor store. 6) Removed configurability of the archive path. It will now always be at - $prefix/var/wview/archive. + /var/lib/wview/archive. 7) Autogenerate CWOP passcode for non-CW/DW stations (Gerry Creager). @@ -1295,8 +1295,8 @@ 2) Add rain rate accumulator to the WMR918 station as the reported rain rate from the station is inferior. -3) Changed default source location for ftp transfers from $prefix/var/wview - to $prefix/var/wview/img so by default no "img" directory will be tacked on +3) Changed default source location for ftp transfers from /var/lib/wview + to /var/lib/wview/img so by default no "img" directory will be tacked on to the destination directory. This will require all users of ftp to modify their wviewftp.conf file to remove all leading "img" references. @@ -1396,7 +1396,7 @@ 2) Added support for generation of NOAA reports in metric units. 3) Added support for a new "pre-generate.sh" script which, if it exists in - $prefix/etc/wview, will be executed after image generation but before + /etc/wview, will be executed after image generation but before template generation. Added to the classic/standard and classic/plus skins. @@ -1468,7 +1468,7 @@ wviewhtmlconfig is run. 8) Changed location of wview configuration and data trees from /etc/wview and - /var/wview to $prefix/etc/wview and $prefix/var/wview respectively. This + /var/lib/wview to /etc/wview and /var/lib/wview respectively. This allows wview to be installed at any prefix specified during the configure process (--prefix=/opt/local for example). Binary files were already being installed to $prefix. This allows wview to be installed/run in a chroot jail @@ -1572,9 +1572,9 @@ 1) Added new meta-tag for file inclusion: !--include filename.xxx--. If this tag is found in any template file, then htmlgend will attempt to open the - file at /var/wview/img/filename.xxx and place its contents in the file + file at /var/lib/wview/img/filename.xxx and place its contents in the file being generated (if your default output location is different from the - default location of /var/wview/img, htmlgend will look in your destination + default location of /var/lib/wview/img, htmlgend will look in your destination folder). Included files can themselves be generated from templates, just place them before the template file which includes them in html-templates.conf (htmlgend generates them in the order found in this conf @@ -1829,11 +1829,11 @@ html-templates.conf and (if supported) forecast.conf without having to restart wview. It can be invoked individually for each process with these commands: - kill -s HUP `cat /var/wview/wviewd.pid` - kill -s HUP `cat /var/wview/htmlgend.pid` - kill -s HUP `cat /var/wview/wviewftpd.pid` - kill -s HUP `cat /var/wview/wviewsshd.pid` - kill -s HUP `cat /var/wview/wvalarmd.pid` + kill -s HUP `cat /var/lib/wview/wviewd.pid` + kill -s HUP `cat /var/lib/wview/htmlgend.pid` + kill -s HUP `cat /var/lib/wview/wviewftpd.pid` + kill -s HUP `cat /var/lib/wview/wviewsshd.pid` + kill -s HUP `cat /var/lib/wview/wvalarmd.pid` 6) Added FTP configuration ability to specify a relative path from the FTP login directory to which the wview-generated files will be transferred. @@ -3015,7 +3015,7 @@ 0.8.3 12-15-2004 -------------------- -1) Changed location of run files to /var/wview (/var/run/* can be purged by +1) Changed location of run files to /var/lib/wview (/var/run/* can be purged by the system). 2) Changed log output to use CONS_ARCHIVE_INTERVAL for sample message. @@ -3041,10 +3041,10 @@ "__attribute__ ((packed))" on several data structures for more portable code. -3) Abolished the /usr/local/wview directory - now configuration files +3) Abolished the /usr/share/wview directory - now configuration files (*.conf, html templates) are located in /etc/wview and run files (*.pid, archive, FIFO devices, images, NOAA) are located in - /var/wview. This allows the dynamic files under /var to be mounted + /var/lib/wview. This allows the dynamic files under /var to be mounted on a ramdisk for embedded applications. 4) Changed the install-env build target to use the new locations. See the @@ -3074,7 +3074,7 @@ The ftpd daemon executable has been renamed "wviewftpd". All three daemons (wviewd, htmlgend and wviewftpd) are installed - in /usr/local/bin by default, although the prefix (=/usr/local) + in /usr/bin by default, although the prefix (=/usr) can be changed when "configure" is invoked. make.config, rules.make, and Makefiles have been removed from @@ -3193,8 +3193,8 @@ of radlib. radlib must now be built separately (and before) wview. radlib can now be located anywhere and the env variable "RADLIB_SRC_BASE" is no longer required at all. Headers and - the library file are stored under "/usr/local/include" and - "/usr/local/lib" respectively. The new radlib version is + the library file are stored under "/usr/include" and + "/usr/lib" respectively. The new radlib version is 1.2 and the distro tree is rooted at "radlib-gpl". The README file has been updated (and simplified) accordingly. 3) Added GPL headers and the "COPYING" file which contains the @@ -3343,7 +3343,7 @@ -------------------- 1) Removed pnggen directory from project - link against system libraries, - build against /usr/local/include + build against /usr/include diff -urN wview-5.20.2/configure wview-5.20.2-patch/configure --- wview-5.20.2/configure 2013-03-12 09:14:29.476042000 +0200 +++ wview-5.20.2-patch/configure 2013-03-12 10:04:56.000000000 +0200 @@ -568,7 +568,7 @@ # # Initializations. # -ac_default_prefix=/usr/local +ac_default_prefix=/usr ac_clean_files= ac_config_libobj_dir=. LIBOBJS= @@ -2261,7 +2261,7 @@ esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_file2=/etc/config.site else ac_site_file1=$ac_default_prefix/share/config.site ac_site_file2=$ac_default_prefix/etc/config.site diff -urN wview-5.20.2/cross-compile/config-libgd-arm-linux wview-5.20.2-patch/cross-compile/config-libgd-arm-linux --- wview-5.20.2/cross-compile/config-libgd-arm-linux 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/cross-compile/config-libgd-arm-linux 2013-03-12 10:04:49.000000000 +0200 @@ -4,7 +4,7 @@ ARCH="arm-linux" # path to the toolchain and kernel base -TOOL_PATH=/usr/local/arm +TOOL_PATH=/usr/arm # path to the toolchain base BASE_PATH=$TOOL_PATH/2.95.3 diff -urN wview-5.20.2/cross-compile/config-libpng-arm-linux wview-5.20.2-patch/cross-compile/config-libpng-arm-linux --- wview-5.20.2/cross-compile/config-libpng-arm-linux 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/cross-compile/config-libpng-arm-linux 2013-03-12 10:04:49.000000000 +0200 @@ -4,7 +4,7 @@ ARCH="arm-linux" # path to the toolchain and kernel base -TOOL_PATH=/usr/local/arm +TOOL_PATH=/usr/arm # path to the toolchain base BASE_PATH=$TOOL_PATH/2.95.3 diff -urN wview-5.20.2/cross-compile/config-libz-arm-linux wview-5.20.2-patch/cross-compile/config-libz-arm-linux --- wview-5.20.2/cross-compile/config-libz-arm-linux 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/cross-compile/config-libz-arm-linux 2013-03-12 10:04:49.000000000 +0200 @@ -4,7 +4,7 @@ ARCH="arm-linux" # path to the toolchain and kernel base -TOOL_PATH=/usr/local/arm +TOOL_PATH=/usr/arm # path to the toolchain base BASE_PATH=$TOOL_PATH/2.95.3 diff -urN wview-5.20.2/cross-compile/config-radlib-arm-linux wview-5.20.2-patch/cross-compile/config-radlib-arm-linux --- wview-5.20.2/cross-compile/config-radlib-arm-linux 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/cross-compile/config-radlib-arm-linux 2013-03-12 10:04:49.000000000 +0200 @@ -5,7 +5,7 @@ VERSION="4.2.4" # path to the toolchain and kernel base -TOOL_PATH=/usr/local/arm_9263 +TOOL_PATH=/usr/arm_9263 # path to the toolchain base BASE_PATH=$TOOL_PATH/usr diff -urN wview-5.20.2/cross-compile/config-wview-arm-linux wview-5.20.2-patch/cross-compile/config-wview-arm-linux --- wview-5.20.2/cross-compile/config-wview-arm-linux 2012-02-23 15:09:12.000000000 +0200 +++ wview-5.20.2-patch/cross-compile/config-wview-arm-linux 2013-03-12 10:04:49.000000000 +0200 @@ -5,7 +5,7 @@ VERSION="2.95.3" # path to the toolchain and kernel base -TOOL_PATH=/usr/local/arm +TOOL_PATH=/usr/arm # path to the toolchain base BASE_PATH=$TOOL_PATH/$VERSION diff -urN wview-5.20.2/dbexport/wview-mysql-create.sh wview-5.20.2-patch/dbexport/wview-mysql-create.sh --- wview-5.20.2/dbexport/wview-mysql-create.sh 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/dbexport/wview-mysql-create.sh 2013-03-12 10:04:34.000000000 +0200 @@ -46,7 +46,7 @@ ## DO NOT CHANGE ANY DEFS IN THIS BLOCK! -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin ## The defaults match the SQLite table names: SQL_ARCHIVE_TABLE=archive diff -urN wview-5.20.2/dbexport/wview-mysql-export.sh wview-5.20.2-patch/dbexport/wview-mysql-export.sh --- wview-5.20.2/dbexport/wview-mysql-export.sh 2012-03-14 14:35:49.000000000 +0200 +++ wview-5.20.2-patch/dbexport/wview-mysql-export.sh 2013-03-12 10:04:34.000000000 +0200 @@ -9,10 +9,10 @@ # Arguments: # debug - indicate to log verbosely and to # create the MySQL debug log file -# $prefix/etc/wview/export/mysql_import.log +# /etc/wview/export/mysql_import.log # create - create MySQL user, database and tables based # on config values in -# $prefix/etc/wview/wview-conf.sdb, then exit +# /etc/wview/wview-conf.sdb, then exit # (should not be given for cron execution) # # History: @@ -31,7 +31,7 @@ ## DO NOT CHANGE ANY DEFS IN THIS BLOCK! -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin SECONDS_IN_DAY=86400 SECONDS_IN_HOUR=3600 diff -urN wview-5.20.2/dbexport/wview-pgsql-create.sh wview-5.20.2-patch/dbexport/wview-pgsql-create.sh --- wview-5.20.2/dbexport/wview-pgsql-create.sh 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/dbexport/wview-pgsql-create.sh 2013-03-12 10:04:34.000000000 +0200 @@ -34,7 +34,7 @@ ## DO NOT CHANGE ANY DEFS IN THIS BLOCK! -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin ## The defaults match the SQLite table names: SQL_ARCHIVE_TABLE=archive diff -urN wview-5.20.2/dbexport/wview-pgsql-export.sh wview-5.20.2-patch/dbexport/wview-pgsql-export.sh --- wview-5.20.2/dbexport/wview-pgsql-export.sh 2012-03-14 14:35:49.000000000 +0200 +++ wview-5.20.2-patch/dbexport/wview-pgsql-export.sh 2013-03-12 10:04:34.000000000 +0200 @@ -9,7 +9,7 @@ # Arguments: # debug - indicate to log verbosely and to # create the PostgreSQL debug log file -# $prefix/etc/wview/export/pgsql_import.log +# /etc/wview/export/pgsql_import.log # # History: # Engineer Date Ver Comments @@ -26,7 +26,7 @@ ## DO NOT CHANGE ANY DEFS IN THIS BLOCK! -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin SECONDS_IN_DAY=86400 SECONDS_IN_HOUR=3600 diff -urN wview-5.20.2/debian/init.d wview-5.20.2-patch/debian/init.d --- wview-5.20.2/debian/init.d 2012-02-24 17:42:45.000000000 +0200 +++ wview-5.20.2-patch/debian/init.d 2013-03-12 10:04:49.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash # add to the shared library search path -export LD_LIBRARY_PATH=/lib:/usr/local/lib:/usr/lib +export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/lib CONF_DIRECTORY=/etc/wview RUN_DIRECTORY=/var/lib/wview WVIEW_INSTALL_DIR=/usr/bin @@ -14,8 +14,8 @@ # Short-Description: Start wview daemons at boot time # Description: Start wview daemons at boot time. ### END INIT INFO -# config: $prefix/etc/wview -# pidfiles: $prefix/var/wview/*.pid +# config: /etc/wview +# pidfiles: /var/lib/wview/*.pid ################################################################################ if [ -f $CONF_DIRECTORY/wview-user ]; then diff -urN wview-5.20.2/debian/postinst wview-5.20.2-patch/debian/postinst --- wview-5.20.2/debian/postinst 2012-02-23 15:09:06.000000000 +0200 +++ wview-5.20.2-patch/debian/postinst 2013-03-12 10:04:49.000000000 +0200 @@ -28,8 +28,8 @@ mkdir -p /var/lib/wview/img/Archive mkdir -p /var/lib/wview/img/NOAA mkdir -p /var/lib/wview/archive - cp -fp /usr/share/wview/var/wview/img/*.* /var/lib/wview/img - cp -fp /usr/share/wview/var/wview/archive/* /var/lib/wview/archive + cp -fp /usr/share/wview/var/lib/wview/img/*.* /var/lib/wview/img + cp -fp /usr/share/wview/var/lib/wview/archive/* /var/lib/wview/archive /usr/bin/sqlite3 /var/lib/wview/archive/wview-archive.sdb '.read /var/lib/wview/archive/wview-archive.sql' echo "==> /var/lib/wview has been created with distro examples" else @@ -128,12 +128,12 @@ ln -s /var/lib/wview/img /srv/weather fi fi - if [ -e /usr/local/www ]; then - if [ ! -e /usr/local/www/wviewmgmt ]; then - ln -s /var/lib/wviewmgmt /usr/local/www/wviewmgmt + if [ -e /usr/www ]; then + if [ ! -e /usr/www/wviewmgmt ]; then + ln -s /var/lib/wviewmgmt /usr/www/wviewmgmt fi - if [ ! -e /usr/local/www/weather ]; then - ln -s /var/lib/wview/img /usr/local/www/weather + if [ ! -e /usr/www/weather ]; then + ln -s /var/lib/wview/img /usr/www/weather fi fi diff -urN wview-5.20.2/debian/wlk2sqlite.1 wview-5.20.2-patch/debian/wlk2sqlite.1 --- wview-5.20.2/debian/wlk2sqlite.1 2012-02-23 15:09:06.000000000 +0200 +++ wview-5.20.2-patch/debian/wlk2sqlite.1 2013-03-12 10:04:49.000000000 +0200 @@ -26,7 +26,7 @@ .B wlk2sqlite . Convert WLK archive file data in source_directory to SQLite3 format in -[destination_directory]/wview-archive.sdb or to $localstatedir/var/wview/archive/wview-archive.sdb +[destination_directory]/wview-archive.sdb or to $localstatedir/var/lib/wview/archive/wview-archive.sdb if [destination_directory] is not given. Only unique records will be inserted. .BR Note: Must be run as root if [destination_directory] is not given. .BR Note: source_directory can be the same as [destination_directory]. diff -urN wview-5.20.2/examples/alarms/outtempMax.sh wview-5.20.2-patch/examples/alarms/outtempMax.sh --- wview-5.20.2/examples/alarms/outtempMax.sh 2012-02-23 15:09:14.000000000 +0200 +++ wview-5.20.2-patch/examples/alarms/outtempMax.sh 2013-03-12 10:04:46.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -mkdir -p /usr/local/var/wview/alarms -echo "`date`:OutTempMax: type $1, threshold $2, trigger $3" >> /usr/local/var/wview/alarms/alarm.log +mkdir -p /var/lib/wview/alarms +echo "`date`:OutTempMax: type $1, threshold $2, trigger $3" >> /var/lib/wview/alarms/alarm.log diff -urN wview-5.20.2/examples/alarms/outtempMin.sh wview-5.20.2-patch/examples/alarms/outtempMin.sh --- wview-5.20.2/examples/alarms/outtempMin.sh 2012-02-23 15:09:14.000000000 +0200 +++ wview-5.20.2-patch/examples/alarms/outtempMin.sh 2013-03-12 10:04:46.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -mkdir -p /usr/local/var/wview/alarms -echo "`date`:OutTempMin: type $1, threshold $2, trigger $3" >> /usr/local/var/wview/alarms/alarm.log +mkdir -p /var/lib/wview/alarms +echo "`date`:OutTempMin: type $1, threshold $2, trigger $3" >> /var/lib/wview/alarms/alarm.log diff -urN wview-5.20.2/examples/conf/wview-conf.sql wview-5.20.2-patch/examples/conf/wview-conf.sql --- wview-5.20.2/examples/conf/wview-conf.sql 2012-03-03 15:38:00.000000000 +0200 +++ wview-5.20.2-patch/examples/conf/wview-conf.sql 2013-03-12 10:04:46.000000000 +0200 @@ -38,8 +38,8 @@ INSERT INTO "config" VALUES('HTMLGEN_STATION_CITY','changeme','Station City:','ENABLE_HTMLGEN'); INSERT INTO "config" VALUES('HTMLGEN_STATION_STATE','changeme','Station State:','ENABLE_HTMLGEN'); INSERT INTO "config" VALUES('HTMLGEN_STATION_SHOW_IF','yes','Show interface details:','ENABLE_HTMLGEN'); -INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/usr/local/var/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN'); -INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/usr/local/etc/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN'); +INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/var/lib/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN'); +INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/etc/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN'); INSERT INTO "config" VALUES('HTMLGEN_START_OFFSET','0','Generation start offset (0-4) in minutes:','ENABLE_HTMLGEN'); INSERT INTO "config" VALUES('HTMLGEN_GENERATE_INTERVAL','1','How often to generate (refresh interval for your site data) in minutes:','ENABLE_HTMLGEN'); INSERT INTO "config" VALUES('HTMLGEN_METRIC_UNITS','no','Enable metric conversion/units?','ENABLE_HTMLGEN'); @@ -61,7 +61,7 @@ INSERT INTO "config" VALUES('ALARMS_1_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS'); INSERT INTO "config" VALUES('ALARMS_1_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS'); INSERT INTO "config" VALUES('ALARMS_1_ABATEMENT','600','Number of seconds to suppress alarms after an alarm triggers:','ENABLE_ALARMS'); -INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/usr/local/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS'); +INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS'); INSERT INTO "config" VALUES('ALARMS_2_TYPE','0','(2 of 10) Alarm Type (see the User Manual file for valid types):','ENABLE_ALARMS'); INSERT INTO "config" VALUES('ALARMS_2_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS'); INSERT INTO "config" VALUES('ALARMS_2_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS'); @@ -113,41 +113,41 @@ INSERT INTO "config" VALUES('FTP_REMOTE_DIRECTORY','','Optional Remote Transfer Directory (relative to the ftp login directory, no leading ''/''):','ENABLE_FTP'); INSERT INTO "config" VALUES('FTP_USE_PASSIVE','yes','Use EPSV FTP transfer mode (if supported):','ENABLE_FTP'); INSERT INTO "config" VALUES('FTP_INTERVAL','5','Global transmit interval (mins):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('SSH_1_SOURCE','/usr/local/var/wview/img','(1 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('SSH_1_SOURCE','/var/lib/wview/img','(1 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_INTERVAL','1','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_HOST','remotehost.net','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_DESTINATION','http/wview','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_PORT','22','SSH Port Number:','ENABLE_SSH'); diff -urN wview-5.20.2/examples/conf/wview-conf.sql-deb-pkg wview-5.20.2-patch/examples/conf/wview-conf.sql-deb-pkg --- wview-5.20.2/examples/conf/wview-conf.sql-deb-pkg 2012-03-03 15:38:23.000000000 +0200 +++ wview-5.20.2-patch/examples/conf/wview-conf.sql-deb-pkg 2013-03-12 10:04:46.000000000 +0200 @@ -113,41 +113,41 @@ INSERT INTO "config" VALUES('FTP_REMOTE_DIRECTORY','','Optional Remote Transfer Directory (relative to the ftp login directory, no leading ''/''):','ENABLE_FTP'); INSERT INTO "config" VALUES('FTP_USE_PASSIVE','yes','Use EPSV FTP transfer mode (if supported):','ENABLE_FTP'); INSERT INTO "config" VALUES('FTP_INTERVAL','5','Global transmit interval (mins):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP'); -INSERT INTO "config" VALUES('SSH_1_SOURCE','/usr/local/var/wview/img','(1 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP'); +INSERT INTO "config" VALUES('SSH_1_SOURCE','/var/lib/wview/img','(1 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_INTERVAL','1','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_HOST','remotehost.net','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_1_DESTINATION','http/wview','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_2_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_3_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_PORT','22','SSH Port Number:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_USERNAME','','Remote SSH username:','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_4_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH'); -INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH'); +INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH'); INSERT INTO "config" VALUES('SSH_5_PORT','22','SSH Port Number:','ENABLE_SSH'); diff -urN wview-5.20.2/examples/Debian/Makefile.am wview-5.20.2-patch/examples/Debian/Makefile.am --- wview-5.20.2/examples/Debian/Makefile.am 2012-02-23 15:09:14.000000000 +0200 +++ wview-5.20.2-patch/examples/Debian/Makefile.am 2013-03-12 10:04:46.000000000 +0200 @@ -11,7 +11,7 @@ -echo "#!/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/Debian/Makefile.in wview-5.20.2-patch/examples/Debian/Makefile.in --- wview-5.20.2/examples/Debian/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/examples/Debian/Makefile.in 2013-03-12 10:04:46.000000000 +0200 @@ -337,7 +337,7 @@ -echo "#!/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/Debian/wview.sh wview-5.20.2-patch/examples/Debian/wview.sh --- wview-5.20.2/examples/Debian/wview.sh 2012-02-24 17:42:40.000000000 +0200 +++ wview-5.20.2-patch/examples/Debian/wview.sh 2013-03-12 10:04:46.000000000 +0200 @@ -7,8 +7,8 @@ # Short-Description: Start wview daemons at boot time # Description: Start wview daemons at boot time. ### END INIT INFO -# config: $prefix/etc/wview -# pidfiles: $prefix/var/wview/*.pid +# config: /etc/wview +# pidfiles: /var/lib/wview/*.pid ################################################################################ if [ -f $CONF_DIRECTORY/wview-user ]; then diff -urN wview-5.20.2/examples/FedoraCore/Makefile.am wview-5.20.2-patch/examples/FedoraCore/Makefile.am --- wview-5.20.2/examples/FedoraCore/Makefile.am 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/FedoraCore/Makefile.am 2013-03-12 10:04:46.000000000 +0200 @@ -11,7 +11,7 @@ echo "#!/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/FedoraCore/Makefile.in wview-5.20.2-patch/examples/FedoraCore/Makefile.in --- wview-5.20.2/examples/FedoraCore/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/examples/FedoraCore/Makefile.in 2013-03-12 10:04:47.000000000 +0200 @@ -337,7 +337,7 @@ echo "#!/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/FedoraCore/wview.sh wview-5.20.2-patch/examples/FedoraCore/wview.sh --- wview-5.20.2/examples/FedoraCore/wview.sh 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/FedoraCore/wview.sh 2013-03-12 10:04:46.000000000 +0200 @@ -4,8 +4,8 @@ # wview Start/Stop the wview daemons # # processnames: wviewd htmlgend wviewftpd wvalarmd wvcwopd wviewsshd wvhttpd -# config: $prefix/etc/wview -# pidfiles: $prefix/var/wview/*.pid +# config: /etc/wview +# pidfiles: /var/lib/wview/*.pid # Source function library: . /etc/init.d/functions diff -urN wview-5.20.2/examples/FreeBSD/Makefile.am wview-5.20.2-patch/examples/FreeBSD/Makefile.am --- wview-5.20.2/examples/FreeBSD/Makefile.am 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/FreeBSD/Makefile.am 2013-03-12 10:04:46.000000000 +0200 @@ -8,10 +8,10 @@ CLEANFILES = $(noinst_SCRIPTS) wview: $(srcdir)/wview.sh - echo "#!/usr/local/bin/bash" > wview + echo "#!/usr/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/FreeBSD/Makefile.in wview-5.20.2-patch/examples/FreeBSD/Makefile.in --- wview-5.20.2/examples/FreeBSD/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/examples/FreeBSD/Makefile.in 2013-03-12 10:04:46.000000000 +0200 @@ -334,10 +334,10 @@ wview: $(srcdir)/wview.sh - echo "#!/usr/local/bin/bash" > wview + echo "#!/usr/bin/bash" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/html/exfoliation/plus/post-generate.sh wview-5.20.2-patch/examples/html/exfoliation/plus/post-generate.sh --- wview-5.20.2/examples/html/exfoliation/plus/post-generate.sh 2012-03-12 13:58:25.000000000 +0200 +++ wview-5.20.2-patch/examples/html/exfoliation/plus/post-generate.sh 2013-03-12 10:04:46.000000000 +0200 @@ -3,7 +3,7 @@ # configure the img directory if it is not already configured. this is for # flash-based systems where the img directory is a ramdisk. STATIC_DIR=/opt/wview/etc/skins/exfoliation/static -WWW_DIR=/var/wview/img +WWW_DIR=/var/lib/wview/img for d in NOAA Archive; do if [ ! -d $WWW_DIR/$d ]; then mkdir $WWW_DIR/$d diff -urN wview-5.20.2/examples/html/exfoliation/readme.txt wview-5.20.2-patch/examples/html/exfoliation/readme.txt --- wview-5.20.2/examples/html/exfoliation/readme.txt 2012-03-12 13:58:25.000000000 +0200 +++ wview-5.20.2-patch/examples/html/exfoliation/readme.txt 2013-03-12 10:04:46.000000000 +0200 @@ -65,13 +65,13 @@ cd /etc/wview tar cvfz site-template-yymmdd.tgz html *.conf *.sh # make a backup of the current site -cd /var/wview +cd /var/lib/wview tar cvfz site-yymmdd.tgz img # extract the exfoliation contents and install them cd /etc/wview/skins tar xvfz exfoliation-for-wview-x.y.z.tgz -cp exfoliation/static/* /var/wview/img +cp exfoliation/static/* /var/lib/wview/img cp exfoliation/standard/*.htx /etc/wview/html cp exfoliation/standard/*.incx /etc/wview/html cp exfoliation/standard/*.conf /etc/wview diff -urN wview-5.20.2/examples/html/exfoliation/standard/post-generate.sh wview-5.20.2-patch/examples/html/exfoliation/standard/post-generate.sh --- wview-5.20.2/examples/html/exfoliation/standard/post-generate.sh 2012-03-12 13:58:25.000000000 +0200 +++ wview-5.20.2-patch/examples/html/exfoliation/standard/post-generate.sh 2013-03-12 10:04:45.000000000 +0200 @@ -3,7 +3,7 @@ # configure the img directory if it is not already configured. this is for # flash-based systems where the img directory is a ramdisk. STATIC_DIR=/opt/wview/etc/skins/exfoliation/static -WWW_DIR=/var/wview/img +WWW_DIR=/var/lib/wview/img for d in NOAA Archive; do if [ ! -d $WWW_DIR/$d ]; then mkdir -p $WWW_DIR/$d diff -urN wview-5.20.2/examples/html/Template-Skins-HOWTO.txt wview-5.20.2-patch/examples/html/Template-Skins-HOWTO.txt --- wview-5.20.2/examples/html/Template-Skins-HOWTO.txt 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/html/Template-Skins-HOWTO.txt 2013-03-12 10:04:43.000000000 +0200 @@ -44,7 +44,7 @@ 8) Static File Support Each skin may have a "static" subdirectory under <your_skin_name>. Files in this directory will be copied to the HTML destination directory (i.e., - /var/wview/img) once when wviewhtmlconfig is run. Examples include page + /var/lib/wview/img) once when wviewhtmlconfig is run. Examples include page backgrounds, css files, etc. Note: Skins will be located at: diff -urN wview-5.20.2/examples/MacOSX/wview/Makefile.am wview-5.20.2-patch/examples/MacOSX/wview/Makefile.am --- wview-5.20.2/examples/MacOSX/wview/Makefile.am 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/MacOSX/wview/Makefile.am 2013-03-12 10:04:46.000000000 +0200 @@ -11,7 +11,7 @@ echo "#!/bin/sh" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/MacOSX/wview/Makefile.in wview-5.20.2-patch/examples/MacOSX/wview/Makefile.in --- wview-5.20.2/examples/MacOSX/wview/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/examples/MacOSX/wview/Makefile.in 2013-03-12 10:04:46.000000000 +0200 @@ -337,7 +337,7 @@ echo "#!/bin/sh" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/NSLU2/wview.sh wview-5.20.2-patch/examples/NSLU2/wview.sh --- wview-5.20.2/examples/NSLU2/wview.sh 2012-02-23 15:09:14.000000000 +0200 +++ wview-5.20.2-patch/examples/NSLU2/wview.sh 2013-03-12 10:04:46.000000000 +0200 @@ -3,7 +3,7 @@ # Process Names: radmrouted wviewd htmlgend wviewftpd wvalarmd # wvcwopd wviewsshd wvhttpd # Config: /etc/wview/*.conf -# Pidfiles: /var/wview/*.pid +# Pidfiles: /var/lib/wview/*.pid # RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted diff -urN wview-5.20.2/examples/scripts/rainInLastWeek.sh wview-5.20.2-patch/examples/scripts/rainInLastWeek.sh --- wview-5.20.2/examples/scripts/rainInLastWeek.sh 2012-03-14 14:35:49.000000000 +0200 +++ wview-5.20.2-patch/examples/scripts/rainInLastWeek.sh 2013-03-12 10:04:46.000000000 +0200 @@ -9,8 +9,8 @@ ## Contributed by n1otx ## Define the location of the archive database (adjust if necessary): -#WVIEW_ARCHIVE_DB=/usr/local/var/wview/archive/wview-archive.sdb -#WVIEW_ARCHIVE_DB=/opt/local/var/wview/archive/wview-archive.sdb +#WVIEW_ARCHIVE_DB=/var/lib/wview/archive/wview-archive.sdb +#WVIEW_ARCHIVE_DB=/opt/local/var/lib/wview/archive/wview-archive.sdb WVIEW_ARCHIVE_DB=/var/lib/wview/archive/wview-archive.sdb sqlite3 $WVIEW_ARCHIVE_DB \ diff -urN wview-5.20.2/examples/scripts/sqlite2mysql-HOWTO.txt wview-5.20.2-patch/examples/scripts/sqlite2mysql-HOWTO.txt --- wview-5.20.2/examples/scripts/sqlite2mysql-HOWTO.txt 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/scripts/sqlite2mysql-HOWTO.txt 2013-03-12 10:04:46.000000000 +0200 @@ -1,5 +1,5 @@ copy the sqlite archive file to a working directory of your choice: -cp /usr/local/var/wview/archive/wview-archive.sdb . +cp /var/lib/wview/archive/wview-archive.sdb . Dump the sqlite file, in this case: sqlite3 wview-archive.sdb .dump .quit >> wview-archive-dump.sql diff -urN wview-5.20.2/examples/scripts/wview-ftp.sh wview-5.20.2-patch/examples/scripts/wview-ftp.sh --- wview-5.20.2/examples/scripts/wview-ftp.sh 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/examples/scripts/wview-ftp.sh 2013-03-12 10:04:46.000000000 +0200 @@ -21,9 +21,9 @@ # These are probably fine, but can be changed if desired, or if images are stored elsewhere -IMG_DIR=/var/wview/img +IMG_DIR=/var/lib/wview/img FTP_LAST_SENT_FILE=ftp-last-sent -FTP_ERROR_LOG=/var/wview/ftperrors +FTP_ERROR_LOG=/var/lib/wview/ftperrors # Set VERBOSE to 1 to log all ftp transers to /var/log/messages. 0 turns logging off. diff -urN wview-5.20.2/examples/SuSE/Makefile.am wview-5.20.2-patch/examples/SuSE/Makefile.am --- wview-5.20.2/examples/SuSE/Makefile.am 2012-02-23 15:09:14.000000000 +0200 +++ wview-5.20.2-patch/examples/SuSE/Makefile.am 2013-03-12 10:04:46.000000000 +0200 @@ -11,7 +11,7 @@ echo "#!/bin/sh" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/examples/SuSE/Makefile.in wview-5.20.2-patch/examples/SuSE/Makefile.in --- wview-5.20.2/examples/SuSE/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/examples/SuSE/Makefile.in 2013-03-12 10:04:46.000000000 +0200 @@ -337,7 +337,7 @@ echo "#!/bin/sh" > wview echo "" >> wview echo "# add to the shared library search path" >> wview - echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview + echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview diff -urN wview-5.20.2/ftp/wviewftp.debug.sh wview-5.20.2-patch/ftp/wviewftp.debug.sh --- wview-5.20.2/ftp/wviewftp.debug.sh 2012-02-23 15:09:09.000000000 +0200 +++ wview-5.20.2-patch/ftp/wviewftp.debug.sh 2013-03-12 10:04:35.000000000 +0200 @@ -20,7 +20,7 @@ # 3. modify the LOGFILE and wviewVAR variables below: # LOGFILE=/root/wview/wview_ftp_debug.txt -wviewVAR=/usr/local/var/wview +wviewVAR=/var/lib/wview wviewFTP_BINARY=/usr/bin/tnftp # # 4. modify your wviewftp.conf file and have wview execute this script for diff -urN wview-5.20.2/http/Makefile.am wview-5.20.2-patch/http/Makefile.am --- wview-5.20.2/http/Makefile.am 2012-02-23 15:09:06.000000000 +0200 +++ wview-5.20.2-patch/http/Makefile.am 2013-03-12 10:04:57.000000000 +0200 @@ -10,7 +10,7 @@ -I$(top_srcdir)/common \ -I$(prefix)/include \ -I/usr/include \ - -I/usr/local/include \ + -I/usr/include \ -D_GNU_SOURCE \ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ diff -urN wview-5.20.2/http/Makefile.in wview-5.20.2-patch/http/Makefile.in --- wview-5.20.2/http/Makefile.in 2012-03-21 14:55:44.000000000 +0200 +++ wview-5.20.2-patch/http/Makefile.in 2013-03-12 10:04:57.000000000 +0200 @@ -177,7 +177,7 @@ -I$(top_srcdir)/common \ -I$(prefix)/include \ -I/usr/include \ - -I/usr/local/include \ + -I/usr/include \ -D_GNU_SOURCE \ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ diff -urN wview-5.20.2/INSTALL wview-5.20.2-patch/INSTALL --- wview-5.20.2/INSTALL 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/INSTALL 2013-03-12 10:04:56.000000000 +0200 @@ -103,8 +103,8 @@ ================== By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the +`/usr/bin', `/usr/man', etc. You can specify an +installation prefix other than `/usr' by giving `configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for @@ -187,7 +187,7 @@ variables may be lost. In order to avoid this problem, you should set them in the `configure' command line, using `VAR=value'. For example: - ./configure CC=/usr/local2/bin/gcc + ./configure CC=/usr2/bin/gcc will cause the specified gcc to be used as the C compiler (unless it is overridden in the site shell script). diff -urN wview-5.20.2/Makefile.am wview-5.20.2-patch/Makefile.am --- wview-5.20.2/Makefile.am 2012-03-12 14:07:43.000000000 +0200 +++ wview-5.20.2-patch/Makefile.am 2013-03-12 10:04:57.000000000 +0200 @@ -47,16 +47,16 @@ if INSTALL_DPKG mkdir -p $(DESTDIR)$(WV_SHARE_DIR) mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/noaa - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/alarms - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/Archive - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/NOAA - mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive - cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img - cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img - cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/noaa + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/alarms + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/Archive + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/NOAA + mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive + cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img + cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img + cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview/export diff -urN wview-5.20.2/Makefile.in wview-5.20.2-patch/Makefile.in --- wview-5.20.2/Makefile.in 2012-03-21 14:55:46.000000000 +0200 +++ wview-5.20.2-patch/Makefile.in 2013-03-12 10:04:38.000000000 +0200 @@ -734,16 +734,16 @@ install-data-hook: @INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR) @INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/noaa -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/alarms -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/Archive -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/NOAA -@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive -@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img -@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img -@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/noaa +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/alarms +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/Archive +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/NOAA +@INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive +@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img +@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img +@INSTALL_DPKG_TRUE@ cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive @INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc @INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview @INSTALL_DPKG_TRUE@ mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview/export diff -urN wview-5.20.2/scripts/wview-install-debian wview-5.20.2-patch/scripts/wview-install-debian --- wview-5.20.2/scripts/wview-install-debian 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/scripts/wview-install-debian 2013-03-12 10:04:36.000000000 +0200 @@ -17,7 +17,7 @@ ############################################################################### ## These are the only two macros you should need to change: -INSTALL_PREFIX=/usr/local +INSTALL_PREFIX=/usr RADLIB_VERSION=2.11.3 @@ -51,7 +51,7 @@ echo "OR - specify -f to this script to force a clean install (delete all existing data)" exit 1 fi - if [ -x $INSTALL_PREFIX/var/wview ]; then + if [ -x $INSTALL_PREFIX/var/lib/wview ]; then echo "wview is installed - use wview-update to update existing installs >= 5.4.0" echo "OR - specify -f to this script to force a clean install (delete all existing data)" exit 1 @@ -101,7 +101,7 @@ # clean up as much as possible before the clean install rm -rf /etc/init.d/wview rm -f $INSTALL_PREFIX/lib/librad.* -rm -rf $INSTALL_PREFIX/var/wview +rm -rf $INSTALL_PREFIX/var/lib/wview rm -rf $INSTALL_PREFIX/include/rad* rm -rf $INSTALL_PREFIX/etc/wview rm -rf $INSTALL_PREFIX/etc/wviewmgmt @@ -176,10 +176,10 @@ echo "No http links created for weather data and configuration" else if [ ! -x $HTTP_ROOT/weather ]; then - ln -s $INSTALL_PREFIX/var/wview/img $HTTP_ROOT/weather + ln -s $INSTALL_PREFIX/var/lib/wview/img $HTTP_ROOT/weather fi if [ ! -x $HTTP_ROOT/wviewmgmt ]; then - ln -s $INSTALL_PREFIX/var/wviewmgmt $HTTP_ROOT/wviewmgmt + ln -s $INSTALL_PREFIX/var/lib/wviewmgmt $HTTP_ROOT/wviewmgmt fi fi diff -urN wview-5.20.2/scripts/wview-install-macosx wview-5.20.2-patch/scripts/wview-install-macosx --- wview-5.20.2/scripts/wview-install-macosx 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/scripts/wview-install-macosx 2013-03-12 10:04:36.000000000 +0200 @@ -13,7 +13,7 @@ # # Uses the $prefix of "/opt/local" thus wview config will # be found at /opt/local/etc/wview and wview data will be -# found at /opt/local/var/wview. +# found at /opt/local/var/lib/wview. ############################################################################### # First, update the ports info: diff -urN wview-5.20.2/scripts/wview-update wview-5.20.2-patch/scripts/wview-update --- wview-5.20.2/scripts/wview-update 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/scripts/wview-update 2013-03-12 10:04:36.000000000 +0200 @@ -8,13 +8,13 @@ # Notes: Must be run with root privileges (sudo ./wview-update). # # Assumes that $prefix for radlib and wview configure was the -# default of "/usr/local" for previous installs. To change this +# default of "/usr" for previous installs. To change this # edit the INSTALL_PREFIX definition. # # Will only update an existing installation. # ############################################################################### -INSTALL_PREFIX=/usr/local +INSTALL_PREFIX=/usr RADLIB_VERSION=2.11.3 BUILD_LOC=$INSTALL_PREFIX/src diff -urN wview-5.20.2/scripts/wview-update-macosx wview-5.20.2-patch/scripts/wview-update-macosx --- wview-5.20.2/scripts/wview-update-macosx 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/scripts/wview-update-macosx 2013-03-12 10:04:36.000000000 +0200 @@ -13,7 +13,7 @@ # # Uses the $prefix of "/opt/local" thus wview config will # be found at /opt/local/etc/wview and wview data will be -# found at /opt/local/var/wview. +# found at /opt/local/var/lib/wview. ############################################################################### echo "Stopping wview:" diff -urN wview-5.20.2/ssh/sshUtils.c wview-5.20.2-patch/ssh/sshUtils.c --- wview-5.20.2/ssh/sshUtils.c 2012-02-23 15:09:13.000000000 +0200 +++ wview-5.20.2-patch/ssh/sshUtils.c 2013-03-12 10:04:38.000000000 +0200 @@ -48,9 +48,9 @@ static char *rsyncPaths[] = { "/usr/bin/rsync", - "/usr/local/bin/rsync", + "/usr/bin/rsync", + "/usr/sbin/rsync", "/usr/sbin/rsync", - "/usr/local/sbin/rsync", NULL }; diff -urN wview-5.20.2/stations/TE923/Makefile.am wview-5.20.2-patch/stations/TE923/Makefile.am --- wview-5.20.2/stations/TE923/Makefile.am 2012-02-23 15:09:10.000000000 +0200 +++ wview-5.20.2-patch/stations/TE923/Makefile.am 2013-03-12 10:04:52.000000000 +0200 @@ -53,11 +53,11 @@ if DARWIN wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c -wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation wviewd_te923_LDADD = else wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c -wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib +wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib if FREEBSD wviewd_te923_LDADD = -lusb else diff -urN wview-5.20.2/stations/TE923/Makefile.in wview-5.20.2-patch/stations/TE923/Makefile.in --- wview-5.20.2/stations/TE923/Makefile.in 2012-03-21 14:55:45.000000000 +0200 +++ wview-5.20.2-patch/stations/TE923/Makefile.in 2013-03-12 10:04:52.000000000 +0200 @@ -252,8 +252,8 @@ $(top_srcdir)/stations/TE923/te923Interface.h \ $(top_srcdir)/stations/TE923/te923Protocol.h $(am__append_1) \ $(am__append_2) -@DARWIN_FALSE@wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -@DARWIN_TRUE@wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +@DARWIN_FALSE@wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib +@DARWIN_TRUE@wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation @DARWIN_FALSE@@FREEBSD_FALSE@wviewd_te923_LDADD = -lusb-1.0 @DARWIN_FALSE@@FREEBSD_TRUE@wviewd_te923_LDADD = -lusb @DARWIN_TRUE@wviewd_te923_LDADD = diff -urN wview-5.20.2/stations/VantagePro/vpconfig/vpinstall.sh wview-5.20.2-patch/stations/VantagePro/vpconfig/vpinstall.sh --- wview-5.20.2/stations/VantagePro/vpconfig/vpinstall.sh 2012-02-23 15:09:10.000000000 +0200 +++ wview-5.20.2-patch/stations/VantagePro/vpconfig/vpinstall.sh 2013-03-12 10:04:50.000000000 +0200 @@ -19,7 +19,7 @@ SCRIPTNAME=vpinstall SCRIPTNAME_VERSION="1.0.1" -WVIEWD_PID=/var/wview/wviewd.pid +WVIEWD_PID=/var/lib/wview/wviewd.pid VPCONFIG_BIN=$WVIEW_INSTALL_DIR/vpconfig test -x $VPCONFIG_BIN || (echo "vpconfig not installed!"; exit 2) @@ -243,7 +243,7 @@ echo "first time so the Vantage Pro can become consistent with the new settings..." echo "" echo "In the meantime, be sure you have deleted any archive files in" -echo "/var/wview/archive if you have changed the archive interval..." +echo "/var/lib/wview/archive if you have changed the archive interval..." echo "" echo "Vantage Pro configuration complete!" echo "" diff -urN wview-5.20.2/stations/VantagePro/vproStates.c wview-5.20.2-patch/stations/VantagePro/vproStates.c --- wview-5.20.2/stations/VantagePro/vproStates.c 2012-02-23 15:09:10.000000000 +0200 +++ wview-5.20.2-patch/stations/VantagePro/vproStates.c 2013-03-12 10:04:50.000000000 +0200 @@ -110,7 +110,7 @@ if (stationVerifyArchiveInterval (work) == ERROR) { radMsgLog (PRI_HIGH, "vproStartProcState: stationVerifyArchiveInterval failed!"); - radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-"); + radMsgLog (PRI_HIGH, "You must either move old /var/lib/wview/archive files out of the way -or-"); radMsgLog (PRI_HIGH, "fix the station setting..."); radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 1); emailAlertSend(ALERT_TYPE_STATION_READ); diff -urN wview-5.20.2/stations/WH1080/Makefile.am wview-5.20.2-patch/stations/WH1080/Makefile.am --- wview-5.20.2/stations/WH1080/Makefile.am 2012-02-23 15:09:10.000000000 +0200 +++ wview-5.20.2-patch/stations/WH1080/Makefile.am 2013-03-12 10:04:52.000000000 +0200 @@ -53,11 +53,11 @@ if DARWIN wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c -wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation wviewd_wh1080_LDADD = else wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c -wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib +wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib if FREEBSD wviewd_wh1080_LDADD = -lusb else diff -urN wview-5.20.2/stations/WH1080/Makefile.in wview-5.20.2-patch/stations/WH1080/Makefile.in --- wview-5.20.2/stations/WH1080/Makefile.in 2012-03-21 14:55:45.000000000 +0200 +++ wview-5.20.2-patch/stations/WH1080/Makefile.in 2013-03-12 10:04:52.000000000 +0200 @@ -252,8 +252,8 @@ $(top_srcdir)/stations/WH1080/wh1080Interface.h \ $(top_srcdir)/stations/WH1080/wh1080Protocol.h $(am__append_1) \ $(am__append_2) -@DARWIN_FALSE@wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -@DARWIN_TRUE@wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +@DARWIN_FALSE@wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib +@DARWIN_TRUE@wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation @DARWIN_FALSE@@FREEBSD_FALSE@wviewd_wh1080_LDADD = -lusb-1.0 @DARWIN_FALSE@@FREEBSD_TRUE@wviewd_wh1080_LDADD = -lusb @DARWIN_TRUE@wviewd_wh1080_LDADD = diff -urN wview-5.20.2/stations/WMRUSB/Makefile.am wview-5.20.2-patch/stations/WMRUSB/Makefile.am --- wview-5.20.2/stations/WMRUSB/Makefile.am 2012-02-23 15:09:09.000000000 +0200 +++ wview-5.20.2-patch/stations/WMRUSB/Makefile.am 2013-03-12 10:04:49.000000000 +0200 @@ -52,11 +52,11 @@ if DARWIN wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c -wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation wviewd_wmrusb_LDADD = else wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c -wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib +wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib if FREEBSD wviewd_wmrusb_LDADD = -lusb else diff -urN wview-5.20.2/stations/WMRUSB/Makefile.in wview-5.20.2-patch/stations/WMRUSB/Makefile.in --- wview-5.20.2/stations/WMRUSB/Makefile.in 2012-03-21 14:55:45.000000000 +0200 +++ wview-5.20.2-patch/stations/WMRUSB/Makefile.in 2013-03-12 10:04:49.000000000 +0200 @@ -252,8 +252,8 @@ $(top_srcdir)/stations/WMRUSB/wmrusbinterface.h \ $(top_srcdir)/stations/WMRUSB/wmrusbprotocol.h $(am__append_1) \ $(am__append_2) -@DARWIN_FALSE@wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -@DARWIN_TRUE@wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation +@DARWIN_FALSE@wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib +@DARWIN_TRUE@wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/lib -framework IOKit -framework CoreFoundation @DARWIN_FALSE@@FREEBSD_FALSE@wviewd_wmrusb_LDADD = -lusb-1.0 @DARWIN_FALSE@@FREEBSD_TRUE@wviewd_wmrusb_LDADD = -lusb @DARWIN_TRUE@wviewd_wmrusb_LDADD = diff -urN wview-5.20.2/stations/WS-2300/ws2300protocol.c wview-5.20.2-patch/stations/WS-2300/ws2300protocol.c --- wview-5.20.2/stations/WS-2300/ws2300protocol.c 2012-02-24 15:57:11.000000000 +0200 +++ wview-5.20.2-patch/stations/WS-2300/ws2300protocol.c 2013-03-12 10:04:49.000000000 +0200 @@ -440,7 +440,7 @@ { // bad magic! radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!"); - radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-"); + radMsgLog (PRI_HIGH, "You must either move old /var/lib/wview/archive files out of the way -or-"); radMsgLog (PRI_HIGH, "fix the wview.conf setting..."); (*(work->medium.exit)) (&work->medium); return WS_STATE_ERROR; diff -urN wview-5.20.2/UPGRADE wview-5.20.2-patch/UPGRADE --- wview-5.20.2/UPGRADE 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/UPGRADE 2013-03-12 10:04:35.000000000 +0200 @@ -37,19 +37,19 @@ Version Specific Directions --------------------------- -0.8.1 or Older: (backup your /usr/local/wview directory first): +0.8.1 or Older: (backup your /usr/share/wview directory first): --------------- (Mandatory) - a) mv /usr/local/wview/html /etc/wview/html - b) mv /usr/local/wview/*.conf /etc/wview - c) mv /usr/local/wview/archive /var/wview/archive - d) mv /usr/local/wview/img /var/wview/img - e) mv /usr/local/wview/noaa.dat /var/wview/noaa/noaa.dat + a) mv /usr/share/wview/html /etc/wview/html + b) mv /usr/share/wview/*.conf /etc/wview + c) mv /usr/share/wview/archive /var/lib/wview/archive + d) mv /usr/share/wview/img /var/lib/wview/img + e) mv /usr/share/wview/noaa.dat /var/lib/wview/noaa/noaa.dat f) Edit your start script (/etc/init.d/wview or /etc/rc.d/wview) - and change the path to the binaries from /usr/local/wview to - /usr/local/bin, change run path from /usr/local/wview to /var/wview + and change the path to the binaries from /usr/share/wview to + /usr/bin, change run path from /usr/share/wview to /var/lib/wview then change the executable name for ftpd to wviewftpd (see the new wview start scripts in examples/* for examples of these changes). @@ -186,23 +186,23 @@ execution from a chroot jail and/or allow package management systems to specify an install/run root prefix, the configure script "--prefix" argument now controls not only where binaries - are installed but also where "/etc/wview" and "/var/wview" are + are installed but also where "/etc/wview" and "/var/lib/wview" are located. The default for configure if no "--prefix" argument - is given is "--prefix=/usr/local". So the new default locations - are: "/usr/local/etc/wview" and "/usr/local/var/wview". + is given is "--prefix=/usr". So the new default locations + are: "/etc/wview" and "/var/lib/wview". Executing "sudo make install-env" for 3.7.0 will create these directories for you, then you will need to move anything - pertinent from the old "/etc/wview" and "/var/wview" locations + pertinent from the old "/etc/wview" and "/var/lib/wview" locations to the new "prefix" locations. Obvious choices are: - "/var/wview/archive" - "/var/wview/alarms" - if applicable + "/var/lib/wview/archive" + "/var/lib/wview/alarms" - if applicable "/etc/wview/alarms" - if applicable "/etc/wview/*.conf <contents>" - not advisable to move directly "/etc/wview/html customizations" Alternatively, if you just refuse to be compliant ;) and *must* keep your config and data trees on the root prefix, you can - specify "--prefix=/ --exec-prefix=/usr/local". But this means + specify "--prefix=/ --exec-prefix=/usr". But this means you must remember this every time you upgrade wview and I am not going to keep reminding you... @@ -216,7 +216,7 @@ (Optional) - Support for a new config file "calibrate.conf" has been added. If you want to calibrate basic sensor readings, copy the example version .../wview-x.y.z/examples/conf/calibrate.conf - to $prefix/etc/wview and edit for your calibration requirements. + to /etc/wview and edit for your calibration requirements. See the example config file or the User Manual for calibration details. @@ -248,7 +248,7 @@ The vast majority of wview configuration has been moved from individual config files to an SQLite3 database: - $prefix/etc/wview/wview-conf.sdb. The wviewconfig script has + /etc/wview/wview-conf.sdb. The wviewconfig script has been updated to support the sqlite3 database. There are also several GUI and web tools for configuring wview including a Web Forms Inteface: $distro/ConfigForms. See the User @@ -261,12 +261,12 @@ wview distribution to import existing WLK archive data to the new SQLite3 database. A default empty archive database file will be installed when you use "make install-env" and is - located in a familiar place: $prefix/var/wview/archive. The + located in a familiar place: /var/lib/wview/archive. The database filename is "wview-archive.sdb". Entering "sudo wlk2sqlite" with no parameters at a shell prompt will display usage details. - wlk2sqlite may require adding "/usr/local/lib" to the + wlk2sqlite may require adding "/usr/lib" to the "LD_LIBRARY_PATH" environment variable: - >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib The User Manual has more details on this process. 5.1.1 or Older: @@ -286,12 +286,12 @@ 1) Leave your old version running, so long as it is 5.0.0+ (i.e., creating archives in wview-archive.sdb). 2) Build and install wview 5.1.1+. - 3) Copy your $prefix/var/wview/archive/wview-archive.sdb database + 3) Copy your /var/lib/wview/archive/wview-archive.sdb database to a working directory. 4) Execute the utility: > hilowcreate [working_directory] 5) When it completes, copy the resulting wview-hilow.sdb database - to $prefix/var/wview/archive. + to /var/lib/wview/archive. 6) Stop old wview. 7) Start new wview, it will pick up archive records for HILOW that were generated during the execution of hilowcreate. @@ -300,12 +300,12 @@ 5.2.0 or Older: --------------- (Mandatory) - 5.2.0 introduces a new method for starting the wviewd daemon - which relies on the newly generated file $prefix/etc/wview/wview-binary. + which relies on the newly generated file /etc/wview/wview-binary. The make install-env process will populate this file based on your station choice during the configure step of wview install. All station binaries are now built and if the station type is changed when running wviewconfig or using the new wviewmgmt - web interface, the $prefix/etc/wview/wview-binary file will + web interface, the /etc/wview/wview-binary file will be updated. To support this you must (in addition to normal steps): 1) Execute the "install-env" target when building: > make install-env @@ -318,13 +318,13 @@ The simple way (but it requires you to reconfigure everything) is to copy the new distro database: - > sudo cp $distro/examples/conf/wview-conf.sdb $prefix/etc/wview + > sudo cp $distro/examples/conf/wview-conf.sdb /etc/wview > sudo wviewconfig (or use the web interface) > sudo /etc/init.d/wview restart The simpler way is to add the three new records to your existing wview-conf.sdb: - > sudo sqlite3 $prefix/etc/wview/wview-conf.sdb + > sudo sqlite3 /etc/wview/wview-conf.sdb sqlite> INSERT INTO "config" VALUES('EMAIL_ADDRESS','address@server.com','Destination for email alerts:',NULL); sqlite> INSERT INTO "config" VALUES('ENABLE_EMAIL_ALERTS','no','Send system alert emails?',NULL); sqlite> INSERT INTO "config" VALUES('SEND_TEST_EMAIL','no','Send a test email?',NULL); @@ -337,11 +337,11 @@ server's document root: > sudo cp -R $distro/wviewmgmt $documentRoot - 2) Make $prefix/etc/wview (the directory) and $prefix/etc/wview/wview-conf.sdb + 2) Make /etc/wview (the directory) and /etc/wview/wview-conf.sdb read-write for the http server account (the new install-env build target does this for you): - > sudo chmod 777 $prefix/etc/wview - > sudo chmod 777 $prefix/etc/wview/wview-conf.sdb + > sudo chmod 777 /etc/wview + > sudo chmod 777 /etc/wview/wview-conf.sdb (This is brute force, you can play with group memberships for the http server account to avoid 777) diff -urN wview-5.20.2/utilities/wlk2sqlite/wlk2sqlite.c wview-5.20.2-patch/utilities/wlk2sqlite/wlk2sqlite.c --- wview-5.20.2/utilities/wlk2sqlite/wlk2sqlite.c 2012-02-24 16:50:35.000000000 +0200 +++ wview-5.20.2-patch/utilities/wlk2sqlite/wlk2sqlite.c 2013-03-12 10:04:56.000000000 +0200 @@ -31,7 +31,7 @@ { printf ("Usage: wlk2sqlite <source_directory> [destination_directory]\n\n"); printf (" Convert WLK archive file data in <source_directory> to SQLite3 format in [destination_directory]/wview-archive.sdb\n"); - printf (" or to $prefix/var/wview/archive/wview-archive.sdb if [destination_directory] is not given\n"); + printf (" or to /var/lib/wview/archive/wview-archive.sdb if [destination_directory] is not given\n"); printf ("Note: Must be run as root if [destination_directory] is not given. Only unique records will be inserted.\n"); printf ("Note: <source_directory> can be the same as [destination_directory]\n\n"); return; @@ -292,7 +292,7 @@ } if (argc < 3) { - printf("Using default $prefix/var/wview/archive destination...\n"); + printf("Using default /var/lib/wview/archive destination...\n"); DestDir = NULL; } else diff -urN wview-5.20.2/wviewconfig/wviewhtmlconfig.sh wview-5.20.2-patch/wviewconfig/wviewhtmlconfig.sh --- wview-5.20.2/wviewconfig/wviewhtmlconfig.sh 2012-03-12 13:58:25.000000000 +0200 +++ wview-5.20.2-patch/wviewconfig/wviewhtmlconfig.sh 2013-03-12 10:04:41.000000000 +0200 @@ -195,7 +195,7 @@ ################################################################################ ################## S C R I P T E X E C U T I O N S T A R T ################# ################################################################################ -export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin +export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/bin:/usr/sbin get_wviewconfig diff -urN wview-5.20.2/wviewmgmt/ftp.php wview-5.20.2-patch/wviewmgmt/ftp.php --- wview-5.20.2/wviewmgmt/ftp.php 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/wviewmgmt/ftp.php 2013-03-12 10:04:37.000000000 +0200 @@ -327,7 +327,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -366,7 +366,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -405,7 +405,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -444,7 +444,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -483,7 +483,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -522,7 +522,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -561,7 +561,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -600,7 +600,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -639,7 +639,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> @@ -678,7 +678,7 @@ <td valaign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File(s) (can have wildcards): <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Source file (relative to $prefix/var/wview/img)</span> + <span class=infobox>Source file (relative to /var/lib/wview/img)</span> </a> </label> </td> diff -urN wview-5.20.2/wviewmgmt/preload_system_status.php wview-5.20.2-patch/wviewmgmt/preload_system_status.php --- wview-5.20.2/wviewmgmt/preload_system_status.php 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/wviewmgmt/preload_system_status.php 2013-03-12 10:04:37.000000000 +0200 @@ -65,7 +65,7 @@ $field_latest_version = file_get_contents('http://www.wviewweather.com/wview-latest.txt'); // See if the wviewPlug updater is installed: - $pidstr = "/usr/local/bin/wviewPlug-updater"; + $pidstr = "/usr/bin/wviewPlug-updater"; if (file_exists($pidstr)) { $field_updater_exists = true; diff -urN wview-5.20.2/wviewmgmt/ssh.php wview-5.20.2-patch/wviewmgmt/ssh.php --- wview-5.20.2/wviewmgmt/ssh.php 2012-02-23 15:09:08.000000000 +0200 +++ wview-5.20.2-patch/wviewmgmt/ssh.php 2013-03-12 10:04:37.000000000 +0200 @@ -186,7 +186,7 @@ <td valign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File or Directory: <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Local Source directory (normally $prefix/var/wview/img)</span> + <span class=infobox>Local Source directory (normally /var/lib/wview/img)</span> </a> </label> </td> @@ -324,7 +324,7 @@ <td valign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File or Directory: <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Local Source directory (normally $prefix/var/wview/img)</span> + <span class=infobox>Local Source directory (normally /var/lib/wview/img)</span> </a> </label> </td> @@ -462,7 +462,7 @@ <td valign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File or Directory: <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Local Source directory (normally $prefix/var/wview/img)</span> + <span class=infobox>Local Source directory (normally /var/lib/wview/img)</span> </a> </label> </td> @@ -600,7 +600,7 @@ <td valign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File or Directory: <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Local Source directory (normally $prefix/var/wview/img)</span> + <span class=infobox>Local Source directory (normally /var/lib/wview/img)</span> </a> </label> </td> @@ -738,7 +738,7 @@ <td valign="center" bgcolor="#FFFFFF"> <label class="formFieldQuestion">Source File or Directory: <a class=info href=#><img src=imgs/tip_small.png border=0> - <span class=infobox>Local Source directory (normally $prefix/var/wview/img)</span> + <span class=infobox>Local Source directory (normally /var/lib/wview/img)</span> </a> </label> </td> diff -urN wview-5.20.2/wview-Quick-Start-FreeBSD.html wview-5.20.2-patch/wview-Quick-Start-FreeBSD.html --- wview-5.20.2/wview-Quick-Start-FreeBSD.html 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/wview-Quick-Start-FreeBSD.html 2013-03-12 10:04:38.000000000 +0200 @@ -111,7 +111,7 @@ <li>Extract the wview distribution: tar zxvf wview-x.y.z.tar.gz</li> <li>Configure the distribution:<br> cd wview-x.y.z<br> - export CFLAGS="-I/usr/local/include"; export LDFLAGS="-L/usr/local/lib";<br> + export CFLAGS="-I/usr/include"; export LDFLAGS="-L/usr/lib";<br> ./configure</li> <li>Build wview: make</li> <li>Install wview: sudo make install</li> diff -urN wview-5.20.2/wview-Quick-Start.html wview-5.20.2-patch/wview-Quick-Start.html --- wview-5.20.2/wview-Quick-Start.html 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/wview-Quick-Start.html 2013-03-12 10:04:38.000000000 +0200 @@ -123,12 +123,12 @@ <li>Build wview: make</li> <li>Install wview: sudo make install</li> <li>If new Vantage Pro, use the on-screen console configuration wizard</li> - <li>If new Vantage Pro, configure the console: /usr/local/bin/vpinstall</li> + <li>If new Vantage Pro, configure the console: /usr/bin/vpinstall</li> <li>Configure wview: $prefix/bin/wviewconfig</li> <li>Configure wview HTML Templates: $prefix/bin/wviewhtmlconfig</li> <li>If new install, copy the run script: cp ./examples/[your_distro]/wview /etc/[your_distro_rc.d_dir]</li> <li>If new install, make the run script executable: chmod +x /etc/[your_distro_rc.d_dir]/wview</li> - <li>Run wview: $prefix/etc/[your_distro_rc.d_dir]/wview start</li> + <li>Run wview: /etc/[your_distro_rc.d_dir]/wview start</li> <li>See wview startup and run logs: tail -n 100 -f /var/log/syslog</li> </p> diff -urN wview-5.20.2/wview-Quick-Start-MacOSX.html wview-5.20.2-patch/wview-Quick-Start-MacOSX.html --- wview-5.20.2/wview-Quick-Start-MacOSX.html 2012-02-23 15:09:16.000000000 +0200 +++ wview-5.20.2-patch/wview-Quick-Start-MacOSX.html 2013-03-12 10:04:47.000000000 +0200 @@ -36,7 +36,7 @@ your ~/.profile file: "export PATH=$PATH:/opt/local/bin" - then execute the following:<br><br> sudo port -d selfupdate (this may take a while)<br> Note: All wview binaries and scripts will be found at /opt/local/bin instead of - /usr/local/bin, so all instructions in the User Manual should have "/usr/local" + /usr/bin, so all instructions in the User Manual should have "/usr" replaced with "/opt/local" for Mac installs<br><br> </li> </ul> @@ -157,10 +157,10 @@ You should see the log message "doing initial html generation now..." at the end of the wview initialization log messages. - > ls -al /opt/local/var/wview/img/index.html + > ls -al /opt/local/var/lib/wview/img/index.html (you should see the file listed) - Open /opt/local/var/wview/img/index.html with your favorite browser - this is your + Open /opt/local/var/lib/wview/img/index.html with your favorite browser - this is your new wview homepage. </pre> </p> diff -urN wview-5.20.2/wview-User-Manual.html wview-5.20.2-patch/wview-User-Manual.html --- wview-5.20.2/wview-User-Manual.html 2012-03-04 17:10:27.000000000 +0200 +++ wview-5.20.2-patch/wview-User-Manual.html 2013-03-12 10:04:35.000000000 +0200 @@ -528,17 +528,17 @@ <p> <b>Run Environment:</b><br> There are several configuration variables which affect the location of the - wview run environment. "--prefix=xxx" (defaults to /usr/local for source + wview run environment. "--prefix=xxx" (defaults to /usr for source builds) is the top-level root for wview install. If "--sysconfdir=xxx" is given to the configure script, it will override the $prefix value for location of the configuration files. If "--localstatedir=xxx" is given, it will override the $prefix value for location of the data files for wview.<br> - Most source installs will want to use the default prefix "/usr/local" (by + Most source installs will want to use the default prefix "/usr" (by not specifying any location parameters to configure).<br><br> There are two file system installation locations of importance for wview. - The configuration "tree" is found at: $prefix/etc/wview and the data "tree" - is located at: $prefix/var/wview. The configuration tree includes the + The configuration "tree" is found at: /etc/wview and the data "tree" + is located at: /var/lib/wview. The configuration tree includes the SQLite3 configuration database, file generation configuration including templates and several file to support SQL export activities. The data tree contains the generated web site (img), all archived weather data (archive) @@ -693,7 +693,7 @@ <!-- Shell Box End --><br><br> <b>Converting a Source Install (tarball) to an APT Install</b><br><br> The debian packages install to different locations than the old default - /usr/local prefix. Avoid running "make uninstall" with the old distro + /usr prefix. Avoid running "make uninstall" with the old distro until you have secured your data. Make backups of your config and data trees to somewhere safe - like your home directory.<br> For example:<br><br> @@ -706,21 +706,21 @@ #> sudo mkdir -p ~/wview-save/etc<br> #> sudo mkdir -p ~/wview-save/var<br> #> sudo /etc/init.d/wview stop<br> - #> sudo rm -rf /usr/local/var/wview/archive/wview-history.sdb<br> + #> sudo rm -rf /var/lib/wview/archive/wview-history.sdb<br> #> sudo rm -rf /etc/init.d/wview<br> - #> sudo cp -rf /usr/local/etc/wview ~/wview-save/etc<br> - #> sudo cp -rf /usr/local/var/wview ~/wview-save/var<br> + #> sudo cp -rf /etc/wview ~/wview-save/etc<br> + #> sudo cp -rf /var/lib/wview ~/wview-save/var<br> #> sudo rm -f /var/www/weather (this should be a symbolic link)<br> #> sudo rm -rf /var/www/wviewmgmt (this should be a symbolic link)<br> - #> cd [radlib_old_source_location] (the old distro source directory, typically /usr/local/src/radlib-X.Y.Z)<br> + #> cd [radlib_old_source_location] (the old distro source directory, typically /usr/src/radlib-X.Y.Z)<br> #> sudo make uninstall<br> - #> cd [wview_old_source_location] (the old distro source directory, typically /usr/local/src/wview-X.Y.Z)<br> + #> cd [wview_old_source_location] (the old distro source directory, typically /usr/src/wview-X.Y.Z)<br> #> sudo make uninstall<br> #> sudo apt-get install wview<br> (if it asks about replacing /etc/init.d/wview, say "Y")<br> (at this point the simulator will be configured and running)<br> #> sudo /etc/init.d/wview stop<br> - #> sudo cp -f ~/wview-save/var/wview/archive/*.* /var/lib/wview/archive<br> + #> sudo cp -f ~/wview-save/var/lib/wview/archive/*.* /var/lib/wview/archive<br> #> sudo cp -rf ~/wview-save/etc/wview/* /etc/wview<br> #> sudo wviewconfig<br> (or use wviewmgmt to update the generation and html paths)<br> @@ -830,10 +830,10 @@ <td> <b>wview Run Environment:</b><br> - Configuration: /usr/local/etc/wview<br> - Data: /usr/local/var/wview<br> - wviewmgmt: /usr/local/var/wviewmgmt linked at /var/www/wviewmgmt<br> - Weather web site: /usr/local/var/wview/img linked at /var/www/weather + Configuration: /etc/wview<br> + Data: /var/lib/wview<br> + wviewmgmt: /var/lib/wviewmgmt linked at /var/www/wviewmgmt<br> + Weather web site: /var/lib/wview/img linked at /var/www/weather </td> </tr> @@ -972,9 +972,9 @@ <b>wview Run Environment:</b><br> Configuration: /opt/local/etc/wview<br> - Data: /opt/local/var/wview<br> - wviewmgmt: /opt/local/var/wviewmgmt<br> - Weather web site: /opt/local/var/wview/img + Data: /opt/local/var/lib/wview<br> + wviewmgmt: /opt/local/var/lib/wviewmgmt<br> + Weather web site: /opt/local/var/lib/wview/img </td> </tr> </table> @@ -1049,7 +1049,7 @@ </p> <ul> <li>Whatever "--prefix" you select during the configure step (default = - /usr/local), the wview start scripts are automatically updated to include + /usr), the wview start scripts are automatically updated to include the proper prefix for binary file and run directories.</li> <li>You should use the same prefix specification when configuring radlib and wview. Further, this should be the default install location @@ -1151,7 +1151,7 @@ <!-- Text --> <p> For purposes of these instructions, the following conventions are used:<br> - <b>[wview_bld_path]</b> is the staging area for building wview (i.e., /usr/local/src).<br> + <b>[wview_bld_path]</b> is the staging area for building wview (i.e., /usr/src).<br> <b>wview-x.y.z</b> is the version of wview you are installing.<br> </p> @@ -1187,7 +1187,7 @@ Important configure options:<br> <blockquote> - <b>--prefix</b> (default: /usr/local) Controls + <b>--prefix</b> (default: /usr) Controls the installation root for wview.<br> <b>--prefix=/ --bindir=/usr/bin --sysconfdir=/etc --localstatedir=/var/lib --libdir=/usr/lib</b> Configure options to use when building from source after a Debian APT installation. This places all binaries @@ -1324,12 +1324,12 @@ <li>Add radlib location to shared library cache:<br> If you get errors similar to:<br> - <b>/usr/local/bin/wviewd: error while loading shared libraries:</b><br> + <b>/usr/bin/wviewd: error while loading shared libraries:</b><br> <b>ibrad.so.0: cannot open shared object file: No such file or directory</b><br> you need to either copy the latest wview start script from the distro (examples/[your_distro]/wview) to your start script location (see the preceeding section), or add the radlib shared library location - (/usr/local/lib) to your shared library cache (see /etc/ld.so.conf) + (/usr/lib) to your shared library cache (see /etc/ld.so.conf) and run ldconfig. </li> <li>Add rsyslog configuration file:<br> @@ -1345,10 +1345,10 @@ <tr> <td> <b>wview Run Environment:</b><br> - Configuration: /usr/local/etc/wview<br> - Data: /usr/local/var/wview<br> - wviewmgmt: /usr/local/var/wviewmgmt linked at /var/www/wviewmgmt<br> - Weather web site: /usr/local/var/wview/img linked at /var/www/weather + Configuration: /etc/wview<br> + Data: /var/lib/wview<br> + wviewmgmt: /var/lib/wviewmgmt linked at /var/www/wviewmgmt<br> + Weather web site: /var/lib/wview/img linked at /var/www/weather </td> </tr> @@ -1520,7 +1520,7 @@ <b>For OSX MacPorts install:</b> already linked properly<br><br> <b>For source install:</b> wviewmgmt will be installed at: - $prefix/var/wviewmgmt<br> + /var/lib/wviewmgmt<br> ($prefix was specified during the "configure" step)<br> You may need to soft link that location in your http document root:<br> <!-- Shell Box Begin --> @@ -1528,7 +1528,7 @@ <tr> <td> - #> sudo ln -s $prefix/var/wviewmgmt [your_document_root]/wviewmgmt<br> + #> sudo ln -s /var/lib/wviewmgmt [your_document_root]/wviewmgmt<br> (of course replacing $prefix and [your_document_root] appropriately) </td> </tr> @@ -1900,7 +1900,7 @@ In order to set these parameters in the VP console, the "vpinstall" script is provided with the wview distribution. Note that all of these can be configured using the On-Screen VP console setup utility. After building and installing wview, - the vpinstall script can be found in ${exec-prefix}/bin (usually /usr/local/bin). It + the vpinstall script can be found in ${exec-prefix}/bin (usually /usr/bin). It is an interactive script which queries you for these initial values then uses the vpconfig utility to commit them to your new VP console. Once completed, it is advisable to wait 10 minutes or so before starting wview for the first time as @@ -1973,7 +1973,7 @@ wview also can generate current condition buckets for Radiation, - UV and ET. See the $prefix/etc/wview/images.conf file for optional + UV and ET. See the /etc/wview/images.conf file for optional images which can be generated.<br><br> To enable extended sensors:<br> @@ -1982,7 +1982,7 @@ <li>Update wview configuration on the File Generation Page, enabling "Generate Extended Sensor Values?".</li> <li>Reconfigure the HTML templates by executing "sudo wviewhtmlconfig".</li> - <li>Customize the templates in $prefix/etc/wview/html if needed.</li> + <li>Customize the templates in /etc/wview/html if needed.</li> </ol> <hr> @@ -1993,7 +1993,7 @@ (using vpinstall). This will skew your rain season totals or render your archived data unusable. If you do change the archive interval after records have been stored by wview, you will need - to delete all archive data in $prefix/var/wview/archive/wview-archive.sdb + to delete all archive data in /var/lib/wview/archive/wview-archive.sdb before restarting wview.<br><br> Note 2: You MUST stop wview before using vpconfig to view or change settings!<br><br> @@ -2259,12 +2259,12 @@ <tr> <td> Configuration files referenced in this chapter:<br><br> - <b>$prefix/etc/wview/html-templates.conf</b> - lists the template - files in $prefix/etc/wview/html to be generated.<br><br> + <b>/etc/wview/html-templates.conf</b> - lists the template + files in /etc/wview/html to be generated.<br><br> - <b>$prefix/etc/wview/images.conf</b> - lists the weather images + <b>/etc/wview/images.conf</b> - lists the weather images (buckets, graphs, dials) to be generated.<br><br> - <b>$prefix/etc/wview/forecast.conf</b> - configures forecast text + <b>/etc/wview/forecast.conf</b> - configures forecast text for Vantage Pro stations. </td> </tr> @@ -2283,7 +2283,7 @@ For any template file named "example.[ext]x" and listed in html-templates.conf, wview will generate a file named "example.[ext]". For example, "myscript.phpx" - listed in html-templates.conf and found in $prefix/var/wview/html will have + listed in html-templates.conf and found in /var/lib/wview/html will have all wview tags replaced and the resulting file will be named "myscript.php". The resulting files are stored at the location specified on the wviewmgmt File Generation page: "Generation Target Path".<br> @@ -2309,7 +2309,7 @@ <p> <b>Notes:</b><br> - Changing HTML templates in $prefix/etc/wview/html does not require a + Changing HTML templates in /etc/wview/html does not require a restart of wview. The changes you make will take effect at the next htmlgend generation cycle.<br><br> Changing the config files images.conf, html-templates.conf and @@ -2322,7 +2322,7 @@ <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - #> sudo kill -s HUP `cat $prefix/var/wview/htmlgend.pid` + #> sudo kill -s HUP `cat /var/lib/wview/htmlgend.pid` </td> </tr> @@ -2335,10 +2335,10 @@ on the wviewmgmt File Generation page (and save changes) prior to running wviewhtmlconfig. It will automatically determine the extended data setting from the configuration database. It is interactive and will save your old - $prefix/etc/wview/html directory to $prefix/etc/wview/html-DATE.TIME.<br> + /etc/wview/html directory to /etc/wview/html-DATE.TIME.<br> As wview users contribute new skins they will be added to the wview distribution and supported by the wviewhtmlconfig script. For information on creating - your own skin, see the file "$prefix/etc/wview/html/Template-Skins-HOWTO.txt". + your own skin, see the file "/etc/wview/html/Template-Skins-HOWTO.txt". <!-- Shell Box Begin --> <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> @@ -2355,7 +2355,7 @@ wview supports template macro file inclusion in template files. The meta-tag is !--include filename.xxx-- (brackets omitted). Any template macro file that is to be included in one or more template files should be listed BEFORE - any templates including it in the $prefix/etc/wview/html-templates.conf + any templates including it in the /etc/wview/html-templates.conf configuration file. There is no restriction on the levels of inclusion, just be sure you specify macro templates early in the html-templates.conf file. The wview default web site templates utilize several header macro @@ -2365,11 +2365,11 @@ <hr> <p> <b>Language</b><br> - HTML template files (in $prefix/etc/wview/html) should be customized to + HTML template files (in /etc/wview/html) should be customized to your language and your design preferences. The configuration file html-templates.conf specifies the template files to be used for generation. You may add or remove from this list as needed.<br> - Weather image captions can be edited in the $prefix/etc/wview/images.conf + Weather image captions can be edited in the /etc/wview/images.conf file for your language preferences. </p> <hr> @@ -2399,9 +2399,9 @@ <p> <b>XML and RSS Feed</b><br> - XML templates should be named "*.xtx" and placed in $prefix/etc/wview/html. + XML templates should be named "*.xtx" and placed in /etc/wview/html. An example RSS feed template is included in the distro: - $prefix/etc/wview/html/wxrss.xtx. An href to it is included in all home + /etc/wview/html/wxrss.xtx. An href to it is included in all home page template examples so the RSS feed may be discovered while visiting your home page. wxrss.xtx should be edited for your site. </p> @@ -2417,15 +2417,15 @@ The rule tag will be replaced by the corresponding text string defined in forecast.conf. Because these capabilities require 35 KB or more of memory (and I think the VP forecasts are hokey), they are disabled by default. - To enable them, rename the file $prefix/etc/wview/forecast.conf-no-forecast - to $prefix/etc/wview/forecast.conf. You must restart wview for this change + To enable them, rename the file /etc/wview/forecast.conf-no-forecast + to /etc/wview/forecast.conf. You must restart wview for this change to take effect. </p> <hr> <p> <b>Generic Tag Generation</b><br> - The template file $prefix/etc/wview/html/parameterlist.htx is provided as + The template file /etc/wview/html/parameterlist.htx is provided as an example of how to obtain all data tags and values through file generation. It could be copied/modified to a PHP template such that the generated file is appropriate for PHP inclusion. An XML template could also be developed. @@ -2435,9 +2435,9 @@ <hr> <p> <b>Pre/Post-Generation Scripts</b><br> - The script file $prefix/etc/wview/pre-generate.sh (if it exists) will be + The script file /etc/wview/pre-generate.sh (if it exists) will be executed by the htmlgend daemon immediately before the generation of all - images and templates. The script file $prefix/etc/wview/post-generate.sh + images and templates. The script file /etc/wview/post-generate.sh (if it exists) will be executed by the htmlgend daemon immediately following the generation of all images and templates. This can be used to perform custom transformations of generated images or files. It should NOT @@ -2533,7 +2533,7 @@ from the command line and issue "ftp> pwd" to find out what the base directory on the remote host is.</li> <li>Local files do not exist: if you specify "Archive/*.txt" in an FTP - rule as the source, if $prefix/var/wview/img/Archive is empty or + rule as the source, if /var/lib/wview/img/Archive is empty or does not exist, this transfer will obviously fail.</li> <li>Conflicting rule definitions: it is possible to define rules and update intervals such that a file with a longer update interval may @@ -2553,7 +2553,7 @@ transfer files in your defined rules which are newer than that date. This conserves time and bandwidth. To cause the wview ftp service to start over, resending all files in your defined rules, you must delete the marker file: - $prefix/var/wview/ftp_marker. wview will send all files and save the new + /var/lib/wview/ftp_marker. wview will send all files and save the new marker file at the next defined update interval. </p><br> @@ -2781,14 +2781,14 @@ <p> <b>Confirming rsync Functionality</b><br> - Place files in $prefix/var/wview/img (if it is not already your + Place files in /var/lib/wview/img (if it is not already your "Generation Target Path" on the wviewmgmt File Generation page): </p> <!-- Shell Box Begin --> <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - root@[wview_server]:# cp [some_test_files] $prefix/var/wview/img + root@[wview_server]:# cp [some_test_files] /var/lib/wview/img </td> </tr> </table> @@ -2828,7 +2828,7 @@ <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - root@[wview_server]:# rsync -aqz --rsh=ssh $prefix/var/wview/img/ [remote_host]:[remote_test_dir] + root@[wview_server]:# rsync -aqz --rsh=ssh /var/lib/wview/img/ [remote_host]:[remote_test_dir] </td> </tr> </table> @@ -2836,7 +2836,7 @@ <p> <br> - This should transfer the files you placed in $prefix/var/wview/img to the + This should transfer the files you placed in /var/lib/wview/img to the remote server in the [remote_test_dir] directory without a password being required. If it prompts for a password, you need to fix it. Left in this state, the wview ssh daemon will not provide any negative feedback @@ -2879,10 +2879,10 @@ <p> wview stores archive data in an SQLite3 database, namely - $prefix/var/wview/archive/wview-archive.sdb. This allows easy data viewing, + /var/lib/wview/archive/wview-archive.sdb. This allows easy data viewing, modifying and post-processing.<br> - HILOW data is stored in the database $prefix/var/wview/archive/wview-hilow.sdb.<br> - NOAA data is stored in the database $prefix/var/wview/archive/wview-noaa.sdb.<br> + HILOW data is stored in the database /var/lib/wview/archive/wview-hilow.sdb.<br> + NOAA data is stored in the database /var/lib/wview/archive/wview-noaa.sdb.<br> This section will describe each of these databases including when and from what data they are created/updated. </p> @@ -2934,17 +2934,17 @@ Usage: wlk2sqlite source_directory [destination_directory]<br><br> source_directory is a required argument but can be the same as [destination_directory] - typically you can use the default archive - file location for your installation, $prefix/var/wview/archive, since there + file location for your installation, /var/lib/wview/archive, since there is nothing destructive about the conversion with respect to the old WLK files, it only reads them.<br><br> - So an example using the default prefix /usr/local would be:<br><br> + So an example using the default prefix /usr would be:<br><br> </p> <!-- Shell Box Begin --> <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - #> sudo wlk2sqlite /usr/local/var/wview/archive + #> sudo wlk2sqlite /var/lib/wview/archive </td> </tr> </table> @@ -2965,7 +2965,7 @@ <tr> <td> - #> sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb<br> + #> sudo sqlite3 /var/lib/wview/archive/wview-archive.sdb<br> sqlite> .help<br> (This displays available commands; non-SQL commands begin with '.')<br><br> sqlite> select * from archive;<br> @@ -2997,7 +2997,7 @@ <tr> <td> Dump the archive table in SQL format:<br> - #> sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename]<br> + #> sudo sqlite3 /var/lib/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename]<br> <br> Copy [my_sql_filename] to the target platform.<br> @@ -3022,17 +3022,17 @@ <p> <b>HILOW Data</b><br><br> <b>Overview</b><br><br> - The database $prefix/var/wview/archive/wview-hilow.sdb will be created + The database /var/lib/wview/archive/wview-hilow.sdb will be created and back-filled using archive records for all records in the archive database.<br> This initialization process can take some time (8-12 minutes per year) but is only required during the first run of wview after an upgrade >= 5.1.0.<br> - Once $prefix/var/wview/archive/wview-hilow.sdb has been created and + Once /var/lib/wview/archive/wview-hilow.sdb has been created and back-filled, wview will add each LOOP sample to the HILOW database.<br><br> <b>Structure</b><br><br> - The $prefix/var/wview/archive/wview-hilow.sdb database has one table + The /var/lib/wview/archive/wview-hilow.sdb database has one table for each of the supported sensor types (i.e., inTemp, outTemp, ... rain, rainRate). Each table contains a record for each hour. The data starts with your earliest archive record.<br><br> @@ -3072,7 +3072,7 @@ <td> <pre> #> /etc/init.d/wview stop -#> sudo rm $prefix/var/wview/archive/wview-hilow.sdb +#> sudo rm /var/lib/wview/archive/wview-hilow.sdb #> /etc/init.d/wview start</pre> </td> </tr> @@ -3126,7 +3126,7 @@ <pre> #> /etc/init.d/wview stop -#> sudo rm $prefix/var/wview/archive/wview-noaa.sdb +#> sudo rm /var/lib/wview/archive/wview-noaa.sdb #> /etc/init.d/wview start</pre> </td> </tr> @@ -3154,7 +3154,7 @@ <td> <pre> #> /etc/init.d/wview stop -#> sudo rm $prefix/var/wview/archive/wview-history.sdb +#> sudo rm /var/lib/wview/archive/wview-history.sdb #> /etc/init.d/wview start</pre> </td> </tr> @@ -3402,13 +3402,13 @@ <b>Setup</b><br><br> Add (or uncomment if already there) the Awekas template in - $prefix/etc/wview/html-templates.conf:<br> + /etc/wview/html-templates.conf:<br> </p> <!-- Shell Box Begin --> <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - #> sudo vi $prefix/etc/wview/html-templates.conf<br><br> + #> sudo vi /etc/wview/html-templates.conf<br><br> (Add the following lines or just remove the '#' from awekas_wl.htx if already there)<br> @@ -3580,18 +3580,18 @@ Alarms?" on the wviewmgmt Alarms page.<br><br> Specify your alarm definitions for up to 10 distinct alarms on the wviewmgmt Alarms page.<br><br> - <b>Scripts: $prefix/etc/wview/alarms/*.sh</b><br><br> + <b>Scripts: /etc/wview/alarms/*.sh</b><br><br> If using notification scripts, they should be placed in - $prefix/etc/wview/alarms and will receive the arguments described above + /etc/wview/alarms and will receive the arguments described above when invoked.<br> There are a few example scripts in the distribution directory - examples/alarms - these will be copied to $prefix/etc/wview/alarms for new + examples/alarms - these will be copied to /etc/wview/alarms for new installs.<br> If using custom binaries, make note of the arguments passed to the binary above.<br> The example scripts log alarm events to a log file: - $prefix/var/wview/alarms/alarm.log. This may be a feature you want to keep - + /var/lib/wview/alarms/alarm.log. This may be a feature you want to keep - even if you are doing other things in your alarm notification scripts.<br><br> <b>Alarm Type Definitions</b><br> </p> @@ -3648,7 +3648,7 @@ <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - #> tail -f $prefix/var/wview/alarms/alarm.log + #> tail -f /var/lib/wview/alarms/alarm.log </td> </tr> </table> @@ -3934,10 +3934,10 @@ Execute with debugs enabled:<br> #> wview-mysql-export debug<br><br> Examine the CSV export files:<br> - #> cat $prefix/etc/wview/export/archive.csv<br> - #> cat $prefix/etc/wview/export/outTemp.csv<br> + #> cat /etc/wview/export/archive.csv<br> + #> cat /etc/wview/export/outTemp.csv<br> - #> cat $prefix/etc/wview/export/noaaHistory.csv<br><br> + #> cat /etc/wview/export/noaaHistory.csv<br><br> These will probably be large given this was the first export. They should contain all records up to the present time.<br><br> Examine the MySQL tables:<br> @@ -3954,7 +3954,7 @@ (There should be one record for each day of archive data)<br><br> Examine the Import Logs:<br> - #> cat $prefix/etc/wview/export/mysql_import.log<br> + #> cat /etc/wview/export/mysql_import.log<br> </td> </tr> </table> @@ -3974,26 +3974,26 @@ 1,6,11,16,21,26,31,36,41,46,51,56 * * * * $exec_prefix/wview-mysql-export<br><br> This runs the wview-mysql-export script every 5 minutes (1 minute past archive record reception for 5 minute archive interval)<br><br> - Example where $exec_prefix is "/usr/local/bin":<br> - 1,6,11,16,21,26,31,36,41,46,51,56 * * * * /usr/local/bin/wview-mysql-export<br> + Example where $exec_prefix is "/usr/bin":<br> + 1,6,11,16,21,26,31,36,41,46,51,56 * * * * /usr/bin/wview-mysql-export<br> </td> </tr> </table> <!-- Shell Box End --> <p> - Done - you can check the $prefix/etc/wview/export directory and the MySQL + Done - you can check the /etc/wview/export directory and the MySQL database to confirm the updates.<br><br> <b>Notes</b><br><br> The records imported into the MySQL database tables are set to replace any existing records with the same dateTime stamp. This is so we get the latest HILOW records for the current hour and so if better/more complete data is re-exported, it will take precedence over older data. You will notice in the - debug log file $prefix/etc/wview/export/mysql_import.log that records are + debug log file /etc/wview/export/mysql_import.log that records are deleted and inserted at incremental updates. This is the HILOW last record phenomenon.<br> If you need to cause a complete re-export of all data, delete the file - $prefix/etc/wview/export/mysql_export_marker. The next time the wview-mysql-export + /etc/wview/export/mysql_export_marker. The next time the wview-mysql-export script runs, all data will be exported (and replace existing data in the MySQL database).<br><br> <b>PostGreSQL and FreeBSD Semaphore Resources</b><br><br> @@ -4052,7 +4052,7 @@ directory.<br></li> <li>Execution of wlk2sqlite may require modifying the dynamic library load path, i.e.:<br> - >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib<br> + >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib<br> You'll know you need this if trying to execute wlk2sqlite produces the following message:<br> *wlk2sqlite: error while loading shared libraries: librad.so.0: @@ -4069,7 +4069,7 @@ <!-- Text --> <p> - <b>Configuration Files ($prefix/etc/wview)</b><br> + <b>Configuration Files (/etc/wview)</b><br> </p> <pre> *.conf - configuration files described below @@ -4081,7 +4081,7 @@ generates new image and html files. </pre><br><br> <p> - <b>Data Files ($prefix/var/wview)</b><br> + <b>Data Files (/var/lib/wview)</b><br> </p> <pre> @@ -4261,21 +4261,21 @@ </p> <pre> root@localhost:/root# ps aux | grep wv - root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/local/bin/radmrouted 1 $prefix/var/wview - root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/local/bin/radmrouted 1 $prefix/var/wview - root 73868 0.0 0.1 2380 1472 ?? Ss 7:08AM 0:00.36 /usr/local/bin/wviewd - root 73870 0.0 0.1 2356 1196 ?? I 7:08AM 0:00.00 /usr/local/bin/wviewd - root 73873 0.0 0.1 2376 1524 ?? Is 7:08AM 0:35.43 /usr/local/bin/wviewsqld - root 73875 0.0 0.1 2324 1140 ?? I 7:08AM 0:00.00 /usr/local/bin/wviewsqld - root 73879 0.0 0.1 2336 1468 ?? Ss 7:08AM 0:00.01 /usr/local/bin/wvalarmd - root 73881 0.0 0.1 2312 1136 ?? I 7:08AM 0:00.00 /usr/local/bin/wvalarmd - root 73882 0.0 0.1 2392 1504 ?? Is 7:08AM 0:00.01 /usr/local/bin/wvcwopd - root 73884 0.0 0.1 2304 1136 ?? I 7:08AM 0:00.00 /usr/local/bin/wvcwopd - root 73885 0.0 0.3 4944 3100 ?? Is 7:08AM 0:00.03 /usr/local/bin/wvhttpd - root 73886 0.0 0.2 4788 2216 ?? I 7:08AM 0:00.00 /usr/local/bin/wvhttpd + root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/bin/radmrouted 1 /var/lib/wview + root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/bin/radmrouted 1 /var/lib/wview + root 73868 0.0 0.1 2380 1472 ?? Ss 7:08AM 0:00.36 /usr/bin/wviewd + root 73870 0.0 0.1 2356 1196 ?? I 7:08AM 0:00.00 /usr/bin/wviewd + root 73873 0.0 0.1 2376 1524 ?? Is 7:08AM 0:35.43 /usr/bin/wviewsqld + root 73875 0.0 0.1 2324 1140 ?? I 7:08AM 0:00.00 /usr/bin/wviewsqld + root 73879 0.0 0.1 2336 1468 ?? Ss 7:08AM 0:00.01 /usr/bin/wvalarmd + root 73881 0.0 0.1 2312 1136 ?? I 7:08AM 0:00.00 /usr/bin/wvalarmd + root 73882 0.0 0.1 2392 1504 ?? Is 7:08AM 0:00.01 /usr/bin/wvcwopd + root 73884 0.0 0.1 2304 1136 ?? I 7:08AM 0:00.00 /usr/bin/wvcwopd + root 73885 0.0 0.3 4944 3100 ?? Is 7:08AM 0:00.03 /usr/bin/wvhttpd + root 73886 0.0 0.2 4788 2216 ?? I 7:08AM 0:00.00 /usr/bin/wvhttpd root@localhost:/root# ps aux | grep htmlgen - root 73876 0.0 0.3 3960 2800 ?? Is 7:08AM 0:05.82 /usr/local/bin/htmlgend - root 73878 0.0 0.2 3860 1964 ?? I 7:08AM 0:00.00 /usr/local/bin/htmlgend + root 73876 0.0 0.3 3960 2800 ?? Is 7:08AM 0:05.82 /usr/bin/htmlgend + root 73878 0.0 0.2 3860 1964 ?? I 7:08AM 0:00.00 /usr/bin/htmlgend root@localhost:/root# </pre><br> <p> @@ -4405,8 +4405,8 @@ starting up wview. You should also when you first install it. Informational logs can later be disabled using the wviewmgmt web interface (Services page) then sending a HUP signal to wviewd and htmlgend: - (kill -s HUP `cat $prefix/var/wview/wviewd.pid`) and - (kill -s HUP `cat $prefix/var/wview/htmlgend.pid`) respectively.<br><br> + (kill -s HUP `cat /var/lib/wview/wviewd.pid`) and + (kill -s HUP `cat /var/lib/wview/htmlgend.pid`) respectively.<br><br> If you have errors in your startup log, you will need to stop all wview daemons using the wview start script (/etc/init.d/wview stop). These are independent processes which will not shut down automatically if there is @@ -4417,7 +4417,7 @@ <pre> Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524756> : radlib: radmrouted started as a daemon ... - Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /usr/local/var/wview + Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /var/lib/wview Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : running... Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : radlib: wviewd started as a daemon ... Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : wview 5.4.0 starting ... @@ -4446,8 +4446,8 @@ Apr 18 08:48:46 linuxquad wviewd[11680]: <1240062526055> : newest archive record: 2009-04-14 22:40 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526745> : radlib: htmlgend started as a daemon ... Apr 18 08:48:46 linuxquad wvalarmd[11691]: <1240062526746> : radlib: wvalarmd started as a daemon ... - Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /usr/local/var/wview/img - Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : templates at /usr/local/etc/wview/html + Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /var/lib/wview/img + Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : templates at /etc/wview/html Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : !! Dual units will be displayed !! Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : Tag Search red-black tree: max black node tree height: 7 Apr 18 08:48:46 linuxquad wvalarmd[11691]: <1240062526747> : ALARM daemon not enabled - exiting... @@ -4463,20 +4463,20 @@ Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend: 0 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend process monitoring is disabled Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvalarmd: 120 - Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvalarmd.pid not present, disable monitoring... + Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvalarmd.pid not present, disable monitoring... Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvcwopd: 120 - Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvcwopd.pid not present, disable monitoring... + Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvcwopd.pid not present, disable monitoring... Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvhttpd: 120 - Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvhttpd.pid not present, disable monitoring... + Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvhttpd.pid not present, disable monitoring... Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wviewsqld: 600 - Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wviewsqld.pid not present, disable monitoring... + Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wviewsqld.pid not present, disable monitoring... Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : running... Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : running... Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : received station info from wviewd: 20090414 22:40:00 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527298> : htmlmgrInit: 51 built-in image definitions added Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527306> : htmlmgrInit: 0 user image definitions added Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: 14 templates added - Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: forecast html tags are disabled - /usr/local/etc/wview/forecast.conf not found... + Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: forecast html tags are disabled - /etc/wview/forecast.conf not found... Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : initializing barometric pressure trend Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : initializing historical stores (this may take some time...) Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : htmlHistoryInit: DAY: samples=0 @@ -4561,13 +4561,13 @@ for each daemon:<br> </p> <pre> - kill -s HUP `cat $prefix/var/wview/wviewd.pid` - kill -s HUP `cat $prefix/var/wview/htmlgend.pid` - kill -s HUP `cat $prefix/var/wview/wviewftpd.pid` - kill -s HUP `cat $prefix/var/wview/wviewsshd.pid` - kill -s HUP `cat $prefix/var/wview/wvalarmd.pid` - kill -s HUP `cat $prefix/var/wview/wvcwopd.pid` - kill -s HUP `cat $prefix/var/wview/wvhttpd.pid` + kill -s HUP `cat /var/lib/wview/wviewd.pid` + kill -s HUP `cat /var/lib/wview/htmlgend.pid` + kill -s HUP `cat /var/lib/wview/wviewftpd.pid` + kill -s HUP `cat /var/lib/wview/wviewsshd.pid` + kill -s HUP `cat /var/lib/wview/wvalarmd.pid` + kill -s HUP `cat /var/lib/wview/wvcwopd.pid` + kill -s HUP `cat /var/lib/wview/wvhttpd.pid` </pre> <!-- Section 6 --> @@ -4659,7 +4659,7 @@ <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2"> <tr> <td> - #> raddebug 1 $prefix/var/wview<br> + #> raddebug 1 /var/lib/wview<br> </td> </tr> </table> @@ -4763,7 +4763,7 @@ Note that some wview startup scripts support the argument "start-trace" which runs the processes in the foreground and traces their system calls using the strace unix utility. Output of strace is placed in the file - ${prefix}/var/wview/[process_name].trace (i.e., htmlgend.trace).<br> + ${prefix}/var/lib/wview/[process_name].trace (i.e., htmlgend.trace).<br> </p> <!-- Appendix 1 --> <h1>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
