[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-647-gaf1a481
Andreas Beckmann
debian at abeckmann.de
Sun Jun 3 07:10:49 UTC 2012
The following commit has been merged in the develop branch:
commit 4e38e163a4a160ab94a9b4330a97ebaa7449a611
Author: Andreas Beckmann <debian at abeckmann.de>
Date: Sat Jun 2 14:04:09 2012 +0200
rename piatti_README.txt => README_piatti.txt
* fix some more obsolete piatti.git references
* link to the current README and config from piatti branch
Signed-off-by: Andreas Beckmann <debian at abeckmann.de>
diff --git a/README.txt b/README.txt
index a62df95..36b2178 100644
--- a/README.txt
+++ b/README.txt
@@ -458,7 +458,7 @@ is being run.
Some of the configuration items are not required, but it is best
to set them all to be sure what the configuration actually is.
-==== piuparts,debian.org specific configuration
+==== piuparts.debian.org specific configuration
In addition to some of the above settings the following
configuration settings are used by the scripts in '~piuparts?/bin/'
@@ -490,4 +490,4 @@ 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;a=blob;f=README.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=README.txt].
+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].
diff --git a/piatti_README.txt b/README_piatti.txt
similarity index 91%
rename from piatti_README.txt
rename to README_piatti.txt
index 30ff08c..d5bd840 100644
--- a/piatti_README.txt
+++ b/README_piatti.txt
@@ -30,7 +30,7 @@ piupartss ALL=(ALL) NOPASSWD: ALL
* sudo apt-get install apt python debootstrap lsof lsb-release python-debian make dpkg-dev python-support asciidoc xmlto python-rpy r-recommended r-base-dev gs
* you need a webserver too, if you run the master
-* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=home/piupartss/bin/update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
+* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob_plain;f=home/piupartss/bin/update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
* mkdir /org/piuparts.debian.org
* sudo ln -s /org/piuparts.debian.org/etc/ /etc/piuparts
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
index 6c5c170..7314cfb 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
+++ b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
@@ -1,7 +1,7 @@
#
# This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
#
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=piatti_README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
#
#
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.piatti b/org/piuparts.debian.org/etc/piuparts.conf.piatti
index 7a25d75..db4d454 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.piatti
+++ b/org/piuparts.debian.org/etc/piuparts.conf.piatti
@@ -1,7 +1,7 @@
#
# This is the configuration file for piuparts running in master-slave mode on piatti.debian.org
#
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=piatti_README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
#
#
diff --git a/piuparts-report.py b/piuparts-report.py
index faf669c..b2abb97 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -117,8 +117,8 @@ HTML_HEADER = """
<tr class="normalrow">
<td class="contentcell">
piuparts.d.o configuration:<br>
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=org/piuparts.debian.org/etc/piuparts.conf.piatti" target="_blank">piuparts.conf.piatti</a><br>
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=tree;f=org/piuparts.debian.org/etc/scripts" target="_blank">scripts</a>
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob_plain;f=org/piuparts.debian.org/etc/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=org/piuparts.debian.org/etc/scripts" target="_blank">scripts</a>
</td>
</tr>
<tr class="normalrow">
@@ -195,8 +195,7 @@ HTML_FOOTER = """
and was written by <a href="mailto:liw at iki.fi">Lars Wirzenius</a> and is now maintained by
<a href="mailto:holger at debian.org">Holger Levsen</a> and
<a href="mailto:piuparts-devel at lists.alioth.debian.org">others</a> using
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git" target="_blank">piuparts.git</a> and
- <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git" target="_blank">piatti.git</a>.
+ <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git" target="_blank">piuparts.git</a>.
Weather icons are from the <a href="http://tango.freedesktop.org/Tango_Icon_Library" target="_blank">Tango Icon Library</a>.
<a href="http://validator.w3.org/check?uri=referer">
<img border="0" src="/images/valid-html401.png" alt="Valid HTML 4.01!" height="15" width="80" align="middle">
--
piuparts git repository
More information about the Piuparts-commits
mailing list