summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2015-04-21 09:52:00 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2015-04-21 09:52:00 -0500
commitb933e161dcce5a178fc869d65044d0cf56df29fd (patch)
tree0ff32e71379140c31cfb98a46d664ef775e47348
parent04c357d9bba17696af0ce47bd20c4898527b6ca2 (diff)
parentae6357ac178bf842eb583ce9dbd1f1101d06d70c (diff)
downloadbcfg2-b933e161dcce5a178fc869d65044d0cf56df29fd.tar.gz
bcfg2-b933e161dcce5a178fc869d65044d0cf56df29fd.tar.bz2
bcfg2-b933e161dcce5a178fc869d65044d0cf56df29fd.zip
Merge pull request #271 from jcftang/master
Add small example for client tools vcs
-rw-r--r--doc/client/tools/vcs.txt28
-rw-r--r--doc/server/plugins/generators/rules.txt5
2 files changed, 31 insertions, 2 deletions
diff --git a/doc/client/tools/vcs.txt b/doc/client/tools/vcs.txt
index fb9c33684..f21d097ff 100644
--- a/doc/client/tools/vcs.txt
+++ b/doc/client/tools/vcs.txt
@@ -8,8 +8,34 @@ VCS Client Tool
.. warning: This tool is currently under development.
-.. note: Currently, the only supported VCS is git.
+.. note: Currently, the only supported VCS is git and svn.
The VCS tool allows you to checkout particular revisions from a VCS
repository on the client to a specified path. The tool requires the
appropriate python libraries for the VCS used to be installed.
+
+See :ref:`server-plugins-generators-rules-vcs` for possible options.
+
+Example usage:
+
+You may want to create a `Rules/paths.xml` with the following:
+
+.. code-block:: xml
+
+ <Rules priority="1">
+ <Path name="/srv/bcfg2" type="vcs"
+ sourceurl="https://github.com/Bcfg2/bcfg2.git"
+ vcstype="git"
+ revision="cf6dfd8ca28e941b1e638ff0fa7e7a0a1ebb6a6f"/>
+ </Rules>
+
+Once the rule is created a client can reference the path from a
+bundle, this path will then be populated from the repository. To
+continue the above example, a file `Bundle/bcfg2.xml` might contain
+this:
+
+.. code-block:: xml
+
+ <Bundle name="bcfg">
+ <Path name="/srv/bcfg2">
+ <Bundle/>
diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt
index 86478a5ae..e4f47c2bf 100644
--- a/doc/server/plugins/generators/rules.txt
+++ b/doc/server/plugins/generators/rules.txt
@@ -248,10 +248,13 @@ Manage symlinks.
:onlyattrs: to
:requiredattrs: to
+.. _server-plugins-generators-rules-vcs:
+
vcs
^^^
-Check out the specified VCS repository to the given path.
+Check out the specified VCS repository to the given path. See
+:ref:`client-tools-vcs` for more details.
.. xml:type:: PathType
:nochildren: