[Treepkg-commits] r83 - in trunk: . bin

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-06-17 20:06:21 +0200 (Tue, 17 Jun 2008)
New Revision: 83

Modified:
   trunk/bin/publishstaticweb.py
   trunk/demostaticweb.cfg
Log:
Make the template used by bin/publishstaticweb.py configurable.


Modified: trunk/bin/publishstaticweb.py
===================================================================
--- trunk/bin/publishstaticweb.py	2008-06-11 12:59:17 UTC (rev 82)
+++ trunk/bin/publishstaticweb.py	2008-06-17 18:06:21 UTC (rev 83)
@@ -1,5 +1,5 @@
 #! /usr/bin/python2.4
-# Copyright (C) 2007 by Intevation GmbH
+# Copyright (C) 2007, 2008 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -28,7 +28,7 @@
     """
     return os.path.expandvars(os.path.expanduser(filename))
 
-staticweb_desc = ["build_user", "build_host", "build_create",
+staticweb_desc = ["build_user", "build_host", "build_create", "build_template",
                   ("build_dir", remove_trailing_slashes),
                   "publish_user", "publish_host",
                   ("publish_dir", remove_trailing_slashes),
@@ -53,7 +53,8 @@
     config = read_config(config_filename)
 
     # create web-page on build host
-    call(cmdexpand("ssh $build_user$@$build_host $build_create $build_dir",
+    call(cmdexpand("ssh $build_user$@$build_host $build_create"
+                   " --status-template=$build_template $build_dir",
                    **config))
 
     # rsync the new web-pages to the local cache

Modified: trunk/demostaticweb.cfg
===================================================================
--- trunk/demostaticweb.cfg	2008-06-11 12:59:17 UTC (rev 82)
+++ trunk/demostaticweb.cfg	2008-06-17 18:06:21 UTC (rev 83)
@@ -17,6 +17,12 @@
 # for that program works.
 build_create: ~/treepkg/bin/createstaticweb.py
 
+# The template for the web-page.  This value is passed as the
+# --status-template argument to the build_create command on the build
+# host.  It should be either an absolute filename or a filename relative
+# to the ~/treepkg/web/ directory.
+build_template: status-by-startdate.html
+
 # the directory on build_host where the static web-site should be put.
 # This value is used as the parameter to the build_create command on
 # build_host.