The following commit has been merged in the develop branch:
commit 5c49078acd885ead2fcefbb1f651b3885ad39e09
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon May 13 15:16:22 2013 +0200
more pejacevic related documentation updates
diff --git a/README.txt b/README.txt
index 2bef280..7ce97b9 100644
--- a/README.txt
+++ b/README.txt
@@ -727,6 +727,7 @@ If you want to run piuparts-report (which is only+very useful if
you run piuparts in master-slave mode), you need to 'apt-get
install python-rpy r-recommended r-base-dev'. For more
information see
-link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt].
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_server.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_server.txt] and
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_pejacevic.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_pejacevic.txt].
// vim: set filetype=asciidoc:
diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index b489bb2..4d1b039 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -8,10 +8,6 @@ installed from git. For regular installations we recommend to use the
piuparts-master and piuparts-slaves packages as described in
/usr/share/doc/piuparts-master/README_server.txt
-== ToDo
-
-- re-read everything and update for pejacevic.d.o
-
== Installation
piuparts.debian.org is a setup running on two systems: pejacevic.debian.org, running the piuparts-master instance and an apache webserver to display the results and piu-slave-bm-a.debian.org, running a piuparts-slave node. Hopefully soon there should be several slave-nodes running on that system.
@@ -19,15 +15,15 @@ piuparts.debian.org is a setup running on two systems: pejacevic.debian.org, run
=== User setup
A piupartss (on piu-slave-bm-a) and a piupartsm (on pejacevic) user is needed. Both are members of the group piuparts and '/srv/piuparts.debian.org' is 774 piupartss:piuparts.
-Both user have some files in $HOME which are kept in git, including hidden files.
-FIXME: this needs to be added to '~/.bashrc':
+Create an SSH keypair for piupartss and put it into '/etc/ssh/userkeys/piupartsm' on pejacevic, so the piupartss can login with ssh and run piuparts-master.
+Restrict it like this:
+
----
-export PATH="~/bin:$PATH"
+$ cat /etc/ssh/userkeys/piupartsm
+command="/srv/piuparts.debian.org/share/piuparts/piuparts-master",from="2001:41c8:1000:21::21:7,5.153.231.7",no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa ...
----
-Create an SSH keypair for piupartss and put it into '~/.ssh/authorized_keys' of the piupartsm user, so the piupartss can login with ssh to localhost as piupartsm.
-
=== '/etc/sudoers' for pejacevic
----
@@ -81,16 +77,16 @@ piupartss ALL = NOPASSWD: ALL
== Updating the piuparts installation
-Updating the master, pejacevic:
+Updating the master, pejacevic.debian.org:
----
-holger at pejacevic$ sudo su - piupartsm update-piuparts-master-setup pejacevic origin
+holger at pejacevic$ sudo su - piupartsm update-piuparts-master-setup bikeshed origin
----
-Updating the slave, pejacevic:
+Updating the slave, piu-slave-bm-a.debian.org:
----
-holger at piu-slave-bm-a$ sudo su - piupartss update-piuparts-slave-setup pejacevic origin
+holger at piu-slave-bm-a$ sudo su - piupartss update-piuparts-slave-setup bikeshed origin
----
== Running piuparts
diff --git a/TODO b/TODO
index cd5e989..1484d3b 100644
--- a/TODO
+++ b/TODO
@@ -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:
@@ -47,17 +42,32 @@ for 0.5x:
- 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
-- update references to piatti with ones to pejacevic
-
- 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
+ - .forward files are not used anymore, drop them from the source
+
+- re-read all documentation carefully and update were needed.
+ - update+cleanup README_pejacevic
+
+- Drop update-piuparts-setup?
+
for 0.6x:
@@ -125,8 +135,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 --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index 92c8dad..459ac85 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -1,7 +1,7 @@
#
# This is the configuration file for piuparts running in master-slave mode on pejacevic.debian.org (as master)
#
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob;f=README_pejacevic.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob;f=README_pejacevic.txt
#
[DEFAULT]
diff --git a/piuparts-report.py b/piuparts-report.py
index 996ca2a..228bb6f 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright 2009-2012 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
# Copyright © 2011-2013 Andreas Beckmann (anbe at debian.org)
#
# This program is free software; you can redistribute it and/or modify it
@@ -121,8 +121,10 @@ HTML_HEADER = """
<tr class="normalrow">
<td class="contentcell">
piuparts.d.o configuration:<br>
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob_plain;f=instances/piuparts.conf.piatti" target="_blank">piuparts.conf.piatti</a><br>
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=tree;f=custom-scripts" target="_blank">scripts</a>
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=instances/piuparts.conf.pejacevic" target="_blank">piuparts.conf.pejacevic</a><br>
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=instances/piuparts.conf.piu-slave-bm-a" target="_blank">piuparts.conf.piu-slave-bm-a</a><br>
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=conf/distros.conf" target="_blank">distros.conf</a><br>
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=tree;f=custom-scripts" target="_blank">scripts</a>
</td>
</tr>
<tr class="normalrow">
--
piuparts git repository