[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-82-g7e76d1d

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 0248da5968792b9e50116ea43e3bfe35d227b584
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 09:20:10 2013 +0100

    p.conf: new global setting backup-directory
    
    for master-bin/prepare-backup
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index c99b4ea..748fbcb 100644
--- a/README.txt
+++ b/README.txt
@@ -478,6 +478,14 @@ used for all further sections.
  the logfiles, generated html files, charts, ... that can be
  served by a webserver.
 
+* "backup-directory" is the directory where the prepare_backup
+ script will place copies of the history data needed to generate the
+ plots. This directory should be included in system backups while
+ the logfiles and html pages in 'master-directory' and
+ 'output-directory' (several GB of data) are regeneratable with some
+ effort and can be excluded from backups. By default this is
+ undefined meaning that no backups of the history data will be made.
+
 * "doc-root" is the location where the webserver will serve the
  piuparts report from. Default: "/".
 
diff --git a/debian/changelog b/debian/changelog
index 026f042..60624f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,9 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Improve the "dirname part contains a symlink" test and report
       overwritten files owned by other packages as failures.
   * piuparts.conf:
-    - New global setting slave-directory.
+    - New global settings:
+      + slave-directory
+      + backup-directory (for the master script prepare_backup)
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
     - Add Package.waiting_count() and friends, populated in calc_rrdep_count.
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 2ecfb7c..52fa9c7 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -14,6 +14,7 @@ bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/
+backup-directory = /org/piuparts.debian.org/backup
 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
 piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index f41ac5b..7ab6408 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -13,6 +13,7 @@ bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/
+backup-directory = /org/piuparts.debian.org/backup
 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
 piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts

-- 
piuparts git repository