[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-741-g73353a4

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 73353a4ecd4c9475f4453f83c6efbc74668401cb
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Jun 18 11:32:07 2012 +0200

    p-r: make doc-root default to "/"
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index a8a2bd2..50af123 100644
--- a/README.txt
+++ b/README.txt
@@ -418,7 +418,7 @@ 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.
+* "doc-root" is the location where the webserver will serve the piuparts report from. Default: "/".
 
 ==== section specific configuration
 
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 2d38775..c627f2b 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -16,6 +16,7 @@ master-host = localhost
 master-user = piupartsm
 master-directory = /var/lib/piuparts/master
 output-directory = /var/lib/piuparts/htdocs
+doc-root = /piuparts/
 master-command = python /usr/share/piuparts/piuparts-master
 idle-sleep = 300
 max-tgz-age = 604800
diff --git a/debian/changelog b/debian/changelog
index 30b21cb..60d2e97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,7 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Defaults for all [section] settings can be set in the [global] section.
     - Make master-command a [global] instead of a [section] setting.
       The section name will be given as an argument to this command.
+    - Make doc-root default to "/".
     - Removed deprecated keys: known_circular_depends.
   * master/db/report: Add a new category /affected/ for failed logs where the
     bug is in a dependency, but only exposed by the package being tested.
diff --git a/piuparts-report.py b/piuparts-report.py
index 6c295c0..a597e2f 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -426,7 +426,7 @@ class Config(piupartslib.conf.Config):
                 "master-directory": ".",
                 "description": "",
                 "max-reserved": 1,
-                "doc-root": "/piuparts/",
+                "doc-root": "/",
             },
             defaults_section=defaults_section)
 

-- 
piuparts git repository