From fccb4e7ce2ceed0e528be431f2c9f44df6d66997 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 17 Mar 2012 17:20:03 +0000 Subject: split 2 small class from main subversion file --- modules/subversion/manifests/init.pp | 15 +-------------- modules/subversion/manifests/pre_commit_link.pp | 8 ++++++++ modules/subversion/manifests/tools.pp | 3 +++ 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 modules/subversion/manifests/pre_commit_link.pp create mode 100644 modules/subversion/manifests/tools.pp diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp index cb0ebbbf..b70fdb2e 100644 --- a/modules/subversion/manifests/init.pp +++ b/modules/subversion/manifests/init.pp @@ -2,12 +2,7 @@ # https://github.com/reductivelabs/puppet-vcsrepo # but not integrated in puppet directly for the moment class subversion { - - class tools { - package { "subversion-tools": } - } - - class server { + class server { include subversion::tools package { "subversion-server": } @@ -113,14 +108,6 @@ class subversion { } - define pre_commit_link() { - $scriptname = regsubst($name,'^.*/', '') - file { "${name}": - ensure => "/usr/local/share/subversion/pre-commit.d/$scriptname", - mode => 755, - } - } - # TODO # deploy a cronjob to make a backup file ( ie, dump in some directory ) diff --git a/modules/subversion/manifests/pre_commit_link.pp b/modules/subversion/manifests/pre_commit_link.pp new file mode 100644 index 00000000..a9b543a7 --- /dev/null +++ b/modules/subversion/manifests/pre_commit_link.pp @@ -0,0 +1,8 @@ +define subversion::pre_commit_link() { + $scriptname = regsubst($name,'^.*/', '') + file { $name: + ensure => 'link', + target => "/usr/local/share/subversion/pre-commit.d/$scriptname", + mode => '0755', + } +} diff --git a/modules/subversion/manifests/tools.pp b/modules/subversion/manifests/tools.pp new file mode 100644 index 00000000..39d86373 --- /dev/null +++ b/modules/subversion/manifests/tools.pp @@ -0,0 +1,3 @@ +class subversion::tools { + package { 'subversion-tools': } +} -- cgit v1.2.1