From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 examples/Bundler/dirvish.xml            | 20 ++++++++++++++++++++
 examples/Bundler/sgenshi-dirvish.genshi | 23 -----------------------
 2 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 examples/Bundler/dirvish.xml
 delete mode 100644 examples/Bundler/sgenshi-dirvish.genshi

(limited to 'examples')

diff --git a/examples/Bundler/dirvish.xml b/examples/Bundler/dirvish.xml
new file mode 100644
index 000000000..47bf8cf54
--- /dev/null
+++ b/examples/Bundler/dirvish.xml
@@ -0,0 +1,20 @@
+<Bundle xmlns:py="http://genshi.edgewall.org/">
+  <py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')">
+    <!-- Generate configs for all users in dirvish.xml -->
+    <BoundPath
+        name='/backup/homes/${user.tag}/dirvish/default.conf'
+        owner='root'
+        group='root'
+        perms='0644'>client: nfs-host
+tree: /export/homes/${user.text}
+exclude:
+	*~
+	.nfs*
+    </BoundPath>
+  </py:for>
+
+  <Package name='dirvish'/>
+  <Path name='/etc/cron.d/dirvish'/>
+  <Path name='/etc/dirvish/dirvish-cronjob'/>
+  <Path name='/etc/dirvish/master.conf'/>
+</Bundle>
diff --git a/examples/Bundler/sgenshi-dirvish.genshi b/examples/Bundler/sgenshi-dirvish.genshi
deleted file mode 100644
index b4ea08f2c..000000000
--- a/examples/Bundler/sgenshi-dirvish.genshi
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-vim: ft=xml
--->
-<Bundle name='sgenshi-dirvish' xmlns:py="http://genshi.edgewall.org/">
-<py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')">
-<!-- Generate configs for all users in dirvish.xml -->
-<BoundPath
-	name='/backup/homes/${user.tag}/dirvish/default.conf'
-	owner='root'
-	group='root'
-	perms='0644'>client: nfs-host
-tree: /export/homes/${user.text}
-exclude:
-	*~
-	.nfs*
-</BoundPath>
-</py:for>
-
-<Package name='dirvish'/>
-<Path name='/etc/cron.d/dirvish'/>
-<Path name='/etc/dirvish/dirvish-cronjob'/>
-<Path name='/etc/dirvish/master.conf'/>
-</Bundle>
-- 
cgit v1.2.3-1-g7c22