summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-12-30 18:17:26 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-12-30 18:17:26 +0000
commit70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7 (patch)
tree9e2ba1c9f392251334a80393db369cc8bbc25750
parentbc1d0e90c5dc5e0012373f59e90e2cccd2ddc47d (diff)
downloadbcfg2-70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7.tar.gz
bcfg2-70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7.tar.bz2
bcfg2-70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7.zip
examples: Update dirvish example for unified entries in 1.0
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5647 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--doc/conf.py3
-rw-r--r--examples/Bundler/sgenshi-dirvish.genshi10
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 782e39320..52148bc16 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,7 +11,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import sys, os
+import os
+import sys
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
diff --git a/examples/Bundler/sgenshi-dirvish.genshi b/examples/Bundler/sgenshi-dirvish.genshi
index 2eb8acd75..19f44a0e8 100644
--- a/examples/Bundler/sgenshi-dirvish.genshi
+++ b/examples/Bundler/sgenshi-dirvish.genshi
@@ -4,7 +4,7 @@ vim: ft=xml
<Bundle name='sgenshi-dirvish' xmlns:py="http://genshi.edgewall.org/">
<py:for each="user in metadata.Properties['dirvish.xml'].data.find('users')">
<!-- Generate configs for all users in dirvish.xml -->
-<BoundConfigFile
+<BoundPath
name='/backup/homes/${user.tag}/dirvish/default.conf'
owner='root'
group='root'
@@ -13,11 +13,11 @@ tree: /export/homes/${user.text}
exclude:
*~
.nfs*
-</BoundConfigFile>
+</BoundPath>
</py:for>
<Package name='dirvish'/>
-<ConfigFile name='/etc/cron.d/dirvish'/>
-<ConfigFile name='/etc/dirvish/dirvish-cronjob'/>
-<ConfigFile name='/etc/dirvish/master.conf'/>
+<Path name='/etc/cron.d/dirvish'/>
+<Path name='/etc/dirvish/dirvish-cronjob'/>
+<Path name='/etc/dirvish/master.conf'/>
</Bundle>