diff options
| author | Michael Scherer <misc@mageia.org> | 2011-06-08 15:09:28 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-06-08 15:09:28 +0000 |
| commit | 01f9773bb56bdf9e03114608e2f65ac177ab1ed3 (patch) | |
| tree | e62d4d814896053ed5208b53d02dbb9078354c35 | |
| parent | 1de5d6030baf6e78145f7d56d3869854b815391c (diff) | |
| download | puppet-01f9773bb56bdf9e03114608e2f65ac177ab1ed3.tar puppet-01f9773bb56bdf9e03114608e2f65ac177ab1ed3.tar.gz puppet-01f9773bb56bdf9e03114608e2f65ac177ab1ed3.tar.bz2 puppet-01f9773bb56bdf9e03114608e2f65ac177ab1ed3.tar.xz puppet-01f9773bb56bdf9e03114608e2f65ac177ab1ed3.zip | |
- manage xinetd configuration, as we modified it
- move the management of /svn to the main module
| -rw-r--r-- | deployment/repositories/manifests/subversion.pp | 7 | ||||
| -rw-r--r-- | modules/subversion/manifests/init.pp | 13 | ||||
| -rw-r--r-- | modules/subversion/templates/xinetd | 14 |
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 %> +} + |