cdist update

software/cdist.mdwn

@@ -120,13 +120,14 @@ how to use cdist.
 There are at least the following branches available:
 
  * master: the development branch
- * 1.3: Support for local and remote code execution (current stable)
+ * 1.4: Support for redefiniton of objects (if equal)
 
 Old versions:
 
- * 1.0: First official release
- * 1.1: __file to __file, __directory, __link migration
+ * 1.3: Support for local and remote code execution (current stable)
  * 1.2: Dependencies supported
+ * 1.1: __file to __file, __directory, __link migration
+ * 1.0: First official release
 
 Other branches may be available for features or bugfixes, but they
 may vanish at any point. To select a specific branch use
@@ -156,6 +157,10 @@ If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
 The master branch on the other hand is the development branch and may not be
 working, break your setup or eat the tree in your garden.
 
+### Upgrading from 1.3 to 1.4
+
+No incompatiblities.
+
 ### Upgrading from 1.2 to 1.3
 
 Rename **gencode** of every type to **gencode-remote**.
@@ -202,7 +207,7 @@ Interesting information are for instance
  * What are the pros/cons you see in cdist?
  * General comments/critics
 
-### Nico Schottelius, Systems Group ETH Zurich
+### Nico Schottelius, Systems Group ETH Zurich and privately
 
 Yes, I'm actually eating my own dogfood and currently managing
 
@@ -216,9 +221,9 @@ Yes, I'm actually eating my own dogfood and currently managing
  * [xfce](http://www.xfce.org/) (lightweight desktop environment)
  * [slim](http://slim.berlios.de/) (graphical login manager for X11)
 
-with cdist on a total of **5** production machines of the
+with cdist on a total of **9** production machines of the
 [Systems Group](http://www.systems.ethz.ch) at the
-[ETH Zurich](http://www.ethz.ch).
+[ETH Zurich](http://www.ethz.ch) as well at home.
 
 ### Steven Armstrong, CBRG ETH Zurich
 

software/cdist/man/cdist-env.html

@@ -604,7 +604,11 @@ in csh variants (csh, tcsh):</p></div>
 <div class="content">
 <pre><tt>eval `./bin/cdist-env`</tt></pre>
 </div></div>
-<div class="paragraph"><p>Replace "./" with the checkout directory of cdist.</p></div>
+<div class="paragraph"><p>For bourne shell, the is also a shorter version:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>. ./bin/cdist-env</tt></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
@@ -624,7 +628,7 @@ granted under the terms of the GNU General Public License version 3 (GPLv3).</p>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-16 10:22:35 CET
+Last updated 2011-03-23 09:29:30 CET
 </div>
 </div>
 </body>

software/cdist/man/cdist-manifest.html

@@ -585,8 +585,10 @@ footnotes: function () {
 host as well as to define which configurations should be applied within a
 type. Manifests are executed locally and the resulting objects are stored in
 an internal database.</p></div>
+<div class="paragraph"><p>The same object can be redefined in multiple different manifests as long as
+the parameters are exactly the same.</p></div>
 <div class="paragraph"><p>In general, manifests are used to define which types are used depending
-on given conditions</p></div>
+on given conditions.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -671,7 +673,7 @@ granted under the terms of the GNU General Public License version 3 (GPLv3).</p>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-18 02:01:46 CET
+Last updated 2011-03-24 13:27:16 CET
 </div>
 </div>
 </body>

software/cdist/man/cdist-reference.html

@@ -792,6 +792,11 @@ __addifnosuchline
 </li>
 <li>
 <p>
+__apt_ppa
+</p>
+</li>
+<li>
+<p>
 __directory
 </p>
 </li>
@@ -952,6 +957,11 @@ cdist-type__addifnosuchline(7)
 </li>
 <li>
 <p>
+cdist-type__apt_ppa(7)
+</p>
+</li>
+<li>
+<p>
 cdist-type__directory(7)
 </p>
 </li>
@@ -1019,7 +1029,7 @@ granted under the terms of the GNU General Public License version 3 (GPLv3).</p>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-21 15:18:15 CET
+Last updated 2011-03-24 13:33:17 CET
 </div>
 </div>
 </body>

software/cdist/man/cdist-type__directory.html

@@ -626,6 +626,16 @@ parents
    Whether to create parents as well (mkdir -p behaviour). Must be yes or no.
 </p>
 </dd>
+<dt class="hdlist1">
+recursive
+</dt>
+<dd>
+<p>
+   If supplied the chgrp and chown call will run recursively.
+   This does <strong>not</strong> influence the behaviour of chmod.
+   Must be yes or no.
+</p>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -641,7 +651,10 @@ __directory /tmp/foobar
 __directory /etc --owner root --group root --mode 0755
 
 # Create nfs service directory, including parents
-__directory /home/services/nfs --parents yes</tt></pre>
+__directory /home/services/nfs --parents yes
+
+# Change permissions recursively
+__directory /home/services --recursive yes --owner root --group root</tt></pre>
 </div></div>
 </div>
 </div>
@@ -668,7 +681,7 @@ granted under the terms of the GNU General Public License version 3 (GPLv3).</p>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-21 09:44:00 CET
+Last updated 2011-03-22 09:53:34 CET
 </div>
 </div>
 </body>