[gnue] r7913 - in trunk: gnue-appserver gnue-common/utils www www/utils www/utils/sbin

[jcater]

Author: jcater
Date: 2005-09-16 14:24:29 -0500 (Fri, 16 Sep 2005)
New Revision: 7913

Modified:
   trunk/gnue-appserver/postweb
   trunk/gnue-common/utils/release
   trunk/www/README
   trunk/www/utils/create-website
   trunk/www/utils/sbin/README
   trunk/www/utils/sbin/create-epydocs
   trunk/www/utils/sbin/create-nightlies
   trunk/www/utils/sbin/update-downloads
   trunk/www/utils/sbin/update-tasks
Log:
record path changes to the website

Modified: trunk/gnue-appserver/postweb
===================================================================
--- trunk/gnue-appserver/postweb        2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/gnue-appserver/postweb        2005-09-16 19:24:29 UTC (rev 7913)
@@ -14,11 +14,11 @@
 
 for i in txt html dvi pdf ps
 do
-  scp doc/whitepaper/whitepaper.$i 
address@hidden:/var/www/tools/appserver/docs/whitepaper
-  scp doc/api/api.$i address@hidden:/var/www/tools/appserver/docs/manual
-  scp doc/devguide/devguide.$i 
address@hidden:/var/www/tools/appserver/docs/manual
+  scp doc/whitepaper/whitepaper.$i 
address@hidden:/usr/local/www/gnue/htdocs/tools/appserver/docs/whitepaper
+  scp doc/api/api.$i 
address@hidden:/usr/local/www/gnue/htdocs/tools/appserver/docs/manual
+  scp doc/devguide/devguide.$i 
address@hidden:/usr/local/www/gnue/htdocs/tools/appserver/docs/manual
 done
-scp doc/devguide/devguide/* 
address@hidden:/var/www/tools/appserver/docs/manual/devguide
+scp doc/devguide/devguide/* 
address@hidden:/usr/local/www/gnue/htdocs/tools/appserver/docs/manual/devguide
 
 (cd doc/whitepaper && make clean)
 (cd doc/devguide && make clean)

Modified: trunk/gnue-common/utils/release
===================================================================
--- trunk/gnue-common/utils/release     2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/gnue-common/utils/release     2005-09-16 19:24:29 UTC (rev 7913)
@@ -48,9 +48,9 @@
 
 # Post to web
 if [ "$release" == "1" ]; then
-  scp dist/* address@hidden:/var/www/downloads/releases
+  scp dist/* address@hidden:/usr/local/www/gnue/htdocs/downloads/releases
 else
-  scp dist/* address@hidden:/var/www/downloads/prereleases
+  scp dist/* address@hidden:/usr/local/www/gnue/htdocs/downloads/prereleases
 fi
 
 # Tag subversion

Modified: trunk/www/README
===================================================================
--- trunk/www/README    2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/www/README    2005-09-16 19:24:29 UTC (rev 7913)
@@ -7,7 +7,7 @@
 The important directories are:
 
   web/          This directory contains files that are copied directly into
-                the destination directory (/var/www) without any 
pre-processing.
+                the destination directory without any pre-processing.
                 Any css styles, images, non-generated php/html files, etc, 
would
                 go into this directory.
 

Modified: trunk/www/utils/create-website
===================================================================
--- trunk/www/utils/create-website      2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/www/utils/create-website      2005-09-16 19:24:29 UTC (rev 7913)
@@ -18,7 +18,7 @@
   If you really want to run this script, run:
     %s --update [--dest <path>] [--htdig /path/to/htdig/templates]
 
-  Be warned! It will try to update your /var/www/ unless you run
+  Be warned! It will try to update your /usr/local/www/gnue/htdocs/ unless you 
run
   it with the --dest option.
 
   You normally won't want to run --htdig on a test machine. It
@@ -32,7 +32,7 @@
   try:
     DEST=sys.argv[sys.argv.index('--dest')+1]
   except ValueError:
-    DEST = "/var/www"
+    DEST = "/usr/local/www/gnue/htdocs"
 
   # Admittedly, not the cleanest coding, but it works.
   utils.DEST = DEST

Modified: trunk/www/utils/sbin/README
===================================================================
--- trunk/www/utils/sbin/README 2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/www/utils/sbin/README 2005-09-16 19:24:29 UTC (rev 7913)
@@ -3,15 +3,15 @@
 Notes: 
  * This utils/sbin/ directory is symlinked as /usr/local/gnue-sandbox/sbin/.
  * Any scripts here run as the "gnue" user, who has access to the svn 
-   repository and /var/www/.
+   repository and /usr/local/www/gnue/htdocs/.
  * The gnue user's home is /usr/local/gnue-sandbox, but scripts probably 
    shouldn't assume this (just in case...)
  * Prior to this being run, a script on ash ensures that related directories
    are all owned by gnue and have group read+write permissions. 
 
-     # find /var/www -type d -exec chmod 2775 "{}" \;
-     # find /var/www -type f -exec chmod 664 "{}" \;
+     # find /usr/local/www/gnue/htdocs -type d -exec chmod 2775 "{}" \;
+     # find /usr/local/www/gnue/htdocs -type f -exec chmod 664 "{}" \;
      # chown -R gnue:gnue /usr/local/gnue-sandbox
-     # chown -R gnue:www-users /var/www
+     # chown -R gnue:www-users /usr/local/www/gnue/htdocs
      # chown -R gnue /var/lib/twiki/templates
 

Modified: trunk/www/utils/sbin/create-epydocs
===================================================================
--- trunk/www/utils/sbin/create-epydocs 2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/www/utils/sbin/create-epydocs 2005-09-16 19:24:29 UTC (rev 7913)
@@ -15,7 +15,7 @@
 
 
 TMPDIR=/tmp/epydoc-$tool-$$
-DESTDIR=/var/www/tools/$tool/docs/api
+DESTDIR=/usr/local/www/gnue/htdocs/tools/$tool/docs/api
 
 
 
@@ -23,7 +23,7 @@
 
 epydoc --html -q -o $TMPDIR ${SRC}
 
-##  epydoc --pdf -q -o /var/www/tools/docs/$tool/api.pdf ${SRC}
+##  epydoc --pdf -q -o /usr/local/www/gnue/htdocs/tools/docs/$tool/api.pdf 
${SRC}
 
 echo
 

Modified: trunk/www/utils/sbin/create-nightlies
===================================================================
--- trunk/www/utils/sbin/create-nightlies       2005-09-16 18:41:00 UTC (rev 
7912)
+++ trunk/www/utils/sbin/create-nightlies       2005-09-16 19:24:29 UTC (rev 
7913)
@@ -17,4 +17,4 @@
 rm -f dist/* 2>&1 > /dev/null
 
 GNUE_VERSION_SUFFIX="+svn.`date +'%Y%m%d'`" $BASE/bin/gcvs setup.py sdist 
--quiet --formats="gztar,zip"
-mv dist/* /var/www/downloads/snapshots/
+mv dist/* /usr/local/www/gnue/htdocs/downloads/snapshots/

Modified: trunk/www/utils/sbin/update-downloads
===================================================================
--- trunk/www/utils/sbin/update-downloads       2005-09-16 18:41:00 UTC (rev 
7912)
+++ trunk/www/utils/sbin/update-downloads       2005-09-16 19:24:29 UTC (rev 
7913)
@@ -3,7 +3,7 @@
 # This script updates the "downloads/current" directory from the
 # "downloads/releases" directory.
 
-cd /var/www/downloads/current && rm -f *
+cd /usr/local/www/gnue/htdocs/downloads/current && rm -f *
 
 packages=$(ls ../releases | sed -e 's/-[0-9].*//' | uniq)
 extensions=".tar.gz .zip .deb .rpm .exe -debug.exe"

Modified: trunk/www/utils/sbin/update-tasks
===================================================================
--- trunk/www/utils/sbin/update-tasks   2005-09-16 18:41:00 UTC (rev 7912)
+++ trunk/www/utils/sbin/update-tasks   2005-09-16 19:24:29 UTC (rev 7913)
@@ -14,7 +14,7 @@
 # Set common environment
 . /usr/local/gnue-sandbox/sbin/environment
 
-export NIGHTLIESLOG=/var/www/downloads/snapshots/build.txt
+export NIGHTLIESLOG=/usr/local/www/gnue/htdocs/downloads/snapshots/build.txt
 
 export OUTFILE="/dev/tty"
 export LOCKFILE=/var/spool/update-website/DO-NOT-REMOVE.update-tasks
@@ -31,7 +31,7 @@
        NIGHTLIES="yes"
        date > $NIGHTLIESLOG  # Start our build log
        # Remove archives older than 5 days
-       rm -f `find /var/www/downloads/snapshots/*-*.* -ctime +5` >/dev/null 
2>&1
+       rm -f `find /usr/local/www/gnue/htdocs/downloads/snapshots/*-*.* -ctime 
+5` >/dev/null 2>&1
        ;;
      --mailto)
        shift
@@ -92,7 +92,7 @@
 # Update the website based on gnue/www/
 echo "Updating website..."
 cd ${CHECKOUT}/www
-$BASE/bin/gcvs utils/create-website --update --dest /var/www/ --htdig 
/etc/htdig/ --twiki /var/lib/twiki/templates/   2>&1 | sed 's/^/  (*) /g'
+$BASE/bin/gcvs utils/create-website --update --dest 
/usr/local/www/gnue/htdocs/ --htdig /etc/htdig/ --twiki 
/var/lib/twiki/templates/   2>&1 | sed 's/^/  (*) /g'
 
 # Update the downloads section
 echo "Updating downloads..."
@@ -121,7 +121,7 @@
   # technotes
   #
   echo -n " (technotes)"
-  TNDEST=/var/www/tools/${tool}/docs/technotes
+  TNDEST=/usr/local/www/gnue/htdocs/tools/${tool}/docs/technotes
   mkdir -p $TNDEST 2>/dev/null
   cp ${CHECKOUT}/gnue-${tool}/doc/technotes/* $TNBASE 2>/dev/null
   (cd $TNDEST && python ${CHECKOUT}/gnue-common/utils/create-technote-index.py)