aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/repositories/manifests/subversion.pp7
-rw-r--r--modules/subversion/manifests/init.pp13
-rw-r--r--modules/subversion/templates/xinetd14
3 files changed, 27 insertions, 7 deletions
diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp
index 8c0ed59d..d8b939de 100644
--- a/deployment/repositories/manifests/subversion.pp
+++ b/deployment/repositories/manifests/subversion.pp
@@ -1,12 +1,5 @@
class repositories::subversion {
- file { "/svn":
- ensure => directory,
- owner => root,
- group => root,
- mode => 755,
- }
-
subversion::repository { "/svn/adm/":
group => "mga-sysadmin",
commit_mail => ["sysadmin-commits@ml.$domain"],
diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp
index b9a1085e..db5f189b 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -14,6 +14,19 @@ class subversion {
package { "subversion-server":
ensure => installed,
}
+
+ $svn_base_path = '/svn/'
+
+ xinetd::service { "svnserve":
+ content => template('subversion/xinetd')
+ }
+
+ file { "$svn_base_path":
+ ensure => directory
+ owner => root,
+ group => root,
+ mode => 755,
+ }
package { ["perl-SVN-Notify-Config", "perl-SVN-Notify-Mirror"]:
ensure => installed,
diff --git a/modules/subversion/templates/xinetd b/modules/subversion/templates/xinetd
new file mode 100644
index 00000000..41759c00
--- /dev/null
+++ b/modules/subversion/templates/xinetd
@@ -0,0 +1,14 @@
+# default: off
+# description: svnserve is the server part of Subversion.
+service svnserve
+{
+ disable = no
+ port = 3690
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = svn
+ server = /usr/bin/svnserve
+ server_args = -i -r <%= svn_base_path %>
+}
+