summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-06-17 14:05:41 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-06-17 14:05:41 -0300
commit1af25652c45c78434bc7e39631f01475d92d1ed1 (patch)
tree246966ce5c6244877737ec34d1c1dfc4222eca55
parent80c49351edc7f7a878a7e00392fdd28434bceefe (diff)
downloadpuppet-viewvc-1af25652c45c78434bc7e39631f01475d92d1ed1.tar.gz
puppet-viewvc-1af25652c45c78434bc7e39631f01475d92d1ed1.tar.bz2
Using root_parents instead of svn_roots
-rw-r--r--manifests/init.pp4
-rw-r--r--templates/viewvc.conf.erb4
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e59b66c..2900952 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,6 @@
class viewvc {
- case $viewvc_svn_roots {
- '': { $viewvc_svn_roots = "svn: /var/lib/svn" }
+ case $viewvc_root_parents {
+ '': { $viewvc_root_parents = "/var/lib/svn : svn" }
}
package { 'viewvc':
diff --git a/templates/viewvc.conf.erb b/templates/viewvc.conf.erb
index 2be6e2a..dff493c 100644
--- a/templates/viewvc.conf.erb
+++ b/templates/viewvc.conf.erb
@@ -104,7 +104,7 @@
## svn_roots = svnrepos: /opt/svn/,
## anotherrepos: /usr/local/svn/repos2
##
-svn_roots = <%= viewvc_svn_roots %>
+#svn_roots = sv: /var/lib/svn
## root_parents: Specifies a list of directories in which any number of
## repositories may reside. Rather than force you to add a new entry
@@ -128,7 +128,7 @@ svn_roots = <%= viewvc_svn_roots %>
## root_parents = /opt/svn : svn,
## /opt/cvs : cvs
##
-#root_parents =
+root_parents = <%= viewvc_root_parents %>
## default_root: This is the name of the default root. Valid names
## include those explicitly listed in the cvs_roots and svn_roots