Using root_parents instead of svn_roots

diff --git a/manifests/init.pp b/manifests/init.pp
index e59b66c989205fd92c339ba7a87fbdf03bcd0e0e..2900952730336bb65bf9695986eb55ab6fc5c11c 100644 (file)
--- 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 2be6e2a459e67023aba56d91ad20cc180b2ab787..dff493c5a4842ad934ca3a31e9757349defe4a8e 100644 (file)
--- 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