From 87c7da13c7121a1274db365dcd502f812297d5e2 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Mon, 24 Jun 2013 17:27:44 +0200 Subject: [PATCH] [package] dont use ubuntu ppa for debian --- manifests/package.pp | 21 +++++++++++++++++---- manifests/package/{debian.pp => ubuntu.pp} | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) rename manifests/package/{debian.pp => ubuntu.pp} (84%) diff --git a/manifests/package.pp b/manifests/package.pp index 722d20a..997f953 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -5,10 +5,23 @@ class git::package { case $::osfamily { 'Debian': { - class { 'git::package::debian': - require => Anchor['git::package::begin'], - before => Anchor['git::package::end'], - } + case $::operatingsystem { + 'ubuntu': { + class { 'git::package::ubuntu': + require => Anchor['git::package::begin'], + before => Anchor['git::package::end'], + } + } + 'debian': { + package { 'git-core': + require => Anchor['git::package::begin'], + before => Anchor['git::package::end'], + } + } + default: { + err("Module ${module_name} does not yet support ${::operatingsystem}") + } + } # Case $::operatingsystem } 'RedHat': { package { 'git': diff --git a/manifests/package/debian.pp b/manifests/package/ubuntu.pp similarity index 84% rename from manifests/package/debian.pp rename to manifests/package/ubuntu.pp index b7bc3df..61fdb67 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/ubuntu.pp @@ -1,5 +1,5 @@ # -class git::package::debian { +class git::package::ubuntu { include apt apt::ppa { 'ppa:git-core/ppa': }