From 2b9e847b222a690a03d78143d201471430ecbb92 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 5 Dec 2012 13:05:33 +0200 Subject: [PATCH] Renamed {git,mercurial,svn}::client as git, mercurial and svn Added {git,mercurial,svn}::client classes with deprecation warning for backwards compatilibity. --- git/manifests/init.pp | 14 ++++++++++---- mercurial/manifests/init.pp | 10 +++++++++- svn/manifests/init.pp | 15 +++++++++++---- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/git/manifests/init.pp b/git/manifests/init.pp index afa5e93..fc16834 100644 --- a/git/manifests/init.pp +++ b/git/manifests/init.pp @@ -1,7 +1,6 @@ - -# Install Git client tools. +# Install Git. # -class git::client { +class git { package { "git": name => $::operatingsystem ? { @@ -13,6 +12,13 @@ class git::client { } +class git::client { + + warning("git::client is deprecated, include git instead") + include git + +} + # Install prequisites for serving Git repositories # @@ -23,7 +29,7 @@ class git::client { # class git::server { - include git::client + include git if $git_datadir { file { $git_datadir: diff --git a/mercurial/manifests/init.pp b/mercurial/manifests/init.pp index d5919e0..1e8a648 100644 --- a/mercurial/manifests/init.pp +++ b/mercurial/manifests/init.pp @@ -1,6 +1,6 @@ # Install Mercurial. # -class mercurial::client { +class mercurial { package { "mercurial": ensure => installed, @@ -8,6 +8,14 @@ class mercurial::client { } +class mercurial::client { + + warning("mercurial::client is deprecated, include mercurial instead") + include mercurial + +} + + # Clone repository. # # === Parameters diff --git a/svn/manifests/init.pp b/svn/manifests/init.pp index 5ee538c..9817abd 100644 --- a/svn/manifests/init.pp +++ b/svn/manifests/init.pp @@ -1,6 +1,6 @@ -# Install svn client tools. +# Install Subversion. # -class svn::client { +class svn { package { "subversion": ensure => installed, @@ -9,14 +9,21 @@ class svn::client { file { "/etc/subversion/servers": ensure => present, mode => "0644", - owner => root, - group => root, + owner => "root", + group => "root", content => template("svn/servers.erb"), require => Package["subversion"], } } +class svn::client { + + warning("svn::client is deprecated, include svn instead") + include svn + +} + # Checkout working copy. #