Merge pull request #466 from paroga/master

[puppet-modules/puppetlabs-apt.git] / manifests / ppa.pp

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 7cb88c8cd5a32ec8b591e6abb1f7bac03fef68df..e86a19fd9d32216f1c1f3a85a0e3f04fb050cb2e 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,8 +1,11 @@
 # ppa.pp
 
 define apt::ppa(
-  $release = $::lsbdistcodename,
-  $options = '-y'
+  $ensure         = 'present',
+  $release        = $::lsbdistcodename,
+  $options        = $::apt::params::ppa_options,
+  $package_name   = $::apt::params::ppa_package,
+  $package_manage = true,
 ) {
   include apt::params
   include apt::update
@@ -13,47 +16,59 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  if $::operatingsystem != 'Ubuntu' {
+    fail('apt::ppa is currently supported on Ubuntu only.')
+  }
+
   $filename_without_slashes = regsubst($name, '/', '-', 'G')
   $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', 'G')
   $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', 'G')
   $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
 
-  $package = $::lsbdistrelease ? {
-    /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
-    default  => 'software-properties-common',
-  }
+  if $ensure == 'present' {
+    if $package_manage {
+      if ! defined(Package[$package_name]) {
+        package { $package_name: }
+      }
 
-  if ! defined(Package[$package]) {
-    package { $package: }
-  }
+      $_require = [File['sources.list.d'], Package[$package_name]]
+    } else {
+      $_require = File['sources.list.d']
+    }
 
-  if defined(Class[apt]) {
-    $proxy_host = getparam(Class[apt], 'proxy_host')
-    $proxy_port = getparam(Class[apt], 'proxy_port')
-    case  $proxy_host {
-      false, '': {
-        $proxy_env = []
+    if defined(Class['apt']) {
+      case $::apt::proxy_host {
+        false, '', undef: {
+          $proxy_env = []
+        }
+        default: {
+          $proxy_env = ["http_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}", "https_proxy=http://${::apt::proxy_host}:${::apt::proxy_port}"]
+        }
       }
-      default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+    } else {
+      $proxy_env = []
+    }
+
+    exec { "add-apt-repository-${name}":
+      environment => $proxy_env,
+      command     => "/usr/bin/add-apt-repository ${options} ${name}",
+      unless      => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
+      user        => 'root',
+      logoutput   => 'on_failure',
+      notify      => Exec['apt_update'],
+      require     => $_require,
     }
-  } else {
-    $proxy_env = []
-  }
-  exec { "add-apt-repository-${name}":
-    environment  => $proxy_env,
-    command      => "/usr/bin/add-apt-repository ${options} ${name}",
-    unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
-    logoutput    => 'on_failure',
-    notify       => Exec['apt_update'],
-    require      => [
-      File[$sources_list_d],
-      Package[$package],
-    ],
-  }
 
-  file { "${sources_list_d}/${sources_list_d_filename}":
-    ensure  => file,
-    require => Exec["add-apt-repository-${name}"],
+    file { "${sources_list_d}/${sources_list_d_filename}":
+      ensure  => file,
+      require => Exec["add-apt-repository-${name}"],
+    }
+  }
+  else {
+    file { "${sources_list_d}/${sources_list_d_filename}":
+      ensure => 'absent',
+      notify => Exec['apt_update'],
+    }
   }
 
   # Need anchor to provide containment for dependencies.