[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit cd251a5f44bb952712a806ebc9c35915ca69b2f8
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Jun 18 02:31:31 2012 +0200

    p-r: document and set doc-root
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index 4beca25..a8a2bd2 100644
--- a/README.txt
+++ b/README.txt
@@ -418,6 +418,8 @@ used for all further sections.
 
 * "output-directory" is the directory where piuparts-report places the logfiles, generated html files, charts, ... that can be served by a webserver.
 
+* "doc-root" is the location where the webserver will serve the piuparts report from. Default: "/piuparts/". Use "/" if it will be on the root of some domain.
+
 ==== section specific configuration
 
 The section specific settings will be reloaded each time a section
diff --git a/TODO b/TODO
index 5e034ef..85a71e9 100644
--- a/TODO
+++ b/TODO
@@ -15,8 +15,6 @@ for 0.45:
 - do not upload with sunny.png weather-severe-alert.png included. Replace them
   with links and add depends to tango-icon-theme. Update copyright.
 
-- doc_root needs to be set in piuparts.conf_piatti and _goldwasser.
-
 - document new packages... descriptions in debian/control should also be improved.
 
 - conf/piuparts.sudoers needs to be split as well...
@@ -26,6 +24,8 @@ for 0.45:
 - split /etc/piuparts/piuparts.conf in /etc/piuparts/master.conf and 
   /etc/piuparts/slave.conf?!
 
+- improve doc-root description in README.txt
+
 - the doc_root needs cleanup and the parameter needs sanitized: a trailing
   slash is required and the $doc_root substitution should be replaced by 
   ${doc_root} and there should be no slash following the }
diff --git a/debian/changelog b/debian/changelog
index dc51429..0bf3956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,8 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Cleanup/wrap some long source lines.
     - Cleanup/wrap some long html lines.
     - Use piatti to serve the README and man page.
-    - Allow the html root to be changed from /.
+    - Allow the html root to be changed from /
+      (piuparts.conf: e.g. [global] doc-root = /piuparts/).
 
   [ Andreas Beckmann ]
   * piuparts.py:
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
index c77bb95..e6c38bc 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
+++ b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
@@ -13,6 +13,7 @@ master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
 output-directory = /org/piuparts.debian.org/htdocs/
+doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
 # this value is too high for production (it will cause piuparts-slave to sleep
 # for a whole day) but useful for testing master-slave mode, for running on a
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.piatti b/org/piuparts.debian.org/etc/piuparts.conf.piatti
index 342e3fd..d65f3d5 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.piatti
+++ b/org/piuparts.debian.org/etc/piuparts.conf.piatti
@@ -12,6 +12,7 @@ master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
 output-directory = /org/piuparts.debian.org/htdocs/
+doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
 # 30*60
 idle-sleep = 1800

-- 
piuparts git repository