[Piuparts-commits] [SCM] piuparts git repository branch, pejacevic, updated. 0.50-156-g94fd2c2

[Holger Levsen]

The following commit has been merged in the pejacevic branch:
commit 94fd2c2a55b27fbdd1e1db60d482c8cc829028aa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon May 13 13:04:02 2013 +0200

    Replace more references to piatti with pejacevic. Also explain that setup a bit more verbose

diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index ca5201d..055d566 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -1,6 +1,13 @@
 Notes about the piuparts installation on pejacevic.debian.org and it's slave
 ============================================================================
 
+This document describes the setup for http://piuparts.debian.org - it's used 
+for reference for the Debian System Administrators (DSA) as well as a guide
+for other setting up a similar system, with the piuparts source code
+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
@@ -18,16 +25,23 @@ FIXME: this needs to be added to ~/.bashrc: export PATH="~/bin:$PATH"
 
 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 piatti
+=== '/etc/sudoers' for pejacevic
+
+----
+#piuparts admins
+%piuparts       ALL=(piupartsm) ALL
+----
+
+=== '/etc/sudoers' for piu-slave-bm-a
 
 ----
 # The piuparts slave needs to handle chroots.
 piupartss       ALL = NOPASSWD: ALL
 
 #piuparts admins
-%piuparts       ALL=(piupartss) ALL
 %piuparts       ALL=(piupartsm) ALL
----
+----
+
 
 === piuparts installation from source
 
diff --git a/debian/piuparts-master.docs b/debian/piuparts-master.docs
index 2506164..c4cb52b 100644
--- a/debian/piuparts-master.docs
+++ b/debian/piuparts-master.docs
@@ -1,3 +1,3 @@
 README_server.txt
-README_piatti.txt
+README_pejacevic.txt
 conf/piuparts.conf.sample
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index c962b7a..e7c0d42 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -1,7 +1,7 @@
 #
-# This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
+# This is the configuration file for piuparts running in master-slave mode on a (development) host called goldwasser
 #
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
+# For more information on this setup see /usr/share/doc/piuparts-master/README_server.txt
 #
 
 [DEFAULT]
diff --git a/update-piuparts-master-setup b/update-piuparts-master-setup
index 7b8defd..6b96110 100755
--- a/update-piuparts-master-setup
+++ b/update-piuparts-master-setup
@@ -2,7 +2,7 @@
 set -e
 
 #
-#  update piuparts master setup on pejacevic.debian.org
+#  update piuparts master setup from git (eg. used on pejacevic.debian.org)
 #
 
 # Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
diff --git a/update-piuparts-slave-setup b/update-piuparts-slave-setup
index a1092d8..e667c80 100755
--- a/update-piuparts-slave-setup
+++ b/update-piuparts-slave-setup
@@ -2,7 +2,7 @@
 set -e
 
 #
-#  update piuparts setup on piatti.debian.org
+#  update piuparts slave setup from git (eg. used on piu-slave-bm-a.debian.org)
 #
 
 # Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)

-- 
piuparts git repository