[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Holger Levsen]

The following commit has been merged in the master branch:
commit a23da25e011e1be356d93533dd69cd5d3d67af6e
Merge: f543d577f8aff21b5366585b4f25cc600e7306b0 219c2728e790b8ee2ccb00f16e11cae9fb95fe03
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon May 13 16:07:25 2013 +0200

    Merge branch 'develop' into bikeshed
    
    solved Conflicts in:
    	TODO
    	debian/changelog
    	instances/forward.goldwasser

diff --combined TODO
index fce3487,15a6013..bc99f26
--- a/TODO
+++ b/TODO
@@@ -28,6 -28,11 +28,6 @@@ for 0.5x
    (since it may be used for remote ssh access to run the slave)
    granting permissions to %piuparts works against this
  
 -- re-read all documentation carefully and update were needed.
 -  - update+cleanup README_pejacevic
 -
 -- Drop update-piuparts-setup?
 -
  - in maintainer view: sort buggy states up again
  
  - more stats and graphs:
@@@ -42,31 -47,17 +42,35 @@@
  - add a sample config with all possible keys set to some useful value
    (like /usr/share/doc/apt/examples/configure-index.gz)
  
 -- look for a solution to use the global debian mirror for debian-backports, too
 -  to avoid hardcoding a specific mirror in distros.conf
 +- look for a solution to use the global debian mirror for debian-backports,
 +  too, to avoid hardcoding a specific mirror in distros.conf
  
 -- sane default for known-problem-directory setting, or define it in piuparts.conf.sample
 +- sane default for known-problem-directory setting, or define it in 
 +  piuparts.conf.sample
  
  - maybe compress all logfiles
  
 +- move counts.txt from htdocs to master
 +
 +- notes from pejacevic setup:
 +  - the need for the symlink from /srv/piuparts.debian.org/etc/piuparts to
 +    /etc/piuparts is awkward when everything else is in 
 +    /srv/piuparts.debian.org
 +  - (likewise that the slave logins as master, even with a restricted key...)
 +  - use mirror via nfs (faster)
 +  - do not use eatmydata (we're using tmpfs in RAM anyway, so installing it
 +    just slows things down)
 +  - ~/bin is not added to PATH
 +
 +- re-read all documentation carefully and update were needed.
 +  - cleanup README_pejacevic
 +
 +- Drop update-piuparts-setup?
 +
+ - update references to piatti with ones to pejacevic
+ 
+ - move counts.txt and sources.txt from htdocs to master
+ 
  
  for 0.6x:
  
@@@ -134,8 -125,8 +138,8 @@@ for 0.7x and later
    - RSS feeds of logs
    - do more fancy R graphs, eg. also per state
    - sort packages on maintainer pages alphabetically (states first though)
 -  - link (and target) to piuparts.d.o configuration is static to piatti. should
 -    refer to the actual hosts configuration, eg goldwassers
 +  - link (and target) to piuparts.d.o configuration is static to pejacevic. should
 +    refer to the actual hosts configuration if running somewhere else
  
  - a redirect of http://piuparts.d.o/foo to http://p.d.o/source/f/foo.html would
    be nice
diff --combined debian/changelog
index 9f7e8ec,e415c73..805b5e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -91,13 -91,9 +91,14 @@@ piuparts (0.51) UNRELEASED; urgency=lo
      - Run slave_cleanup before starting the slave.
    * Bump Standards-Version to 3.9.4.
    * Use /srv/piuparts.debian.org/ on piatti.debian.org as per DSA policy.
-   * detect_slave_problems: remove check limiting this script to be run on
-     piatti only.
 +  * Provide instance configuration for pejacevic.d.o and piu-slave-bm-a.d.o.
 +  * Move README_piatti.txt and README_pejacevic.txt and update accordingly.
 +  * Provide two new helper scripts for running from git:
 +    update-piuparts-master-setup and update-piuparts-slave-setup.
 +  * Drop instances/forward.* files.
+   * slave-bin/detect_slave_problems: remove check limiting this script to be
+     run on piatti only.
+   * master-bin/prepare_backup: also backup sources.txt.
  
   -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
  

-- 
piuparts git repository