Merge pull request #543 from puppetlabs/revert-542-fix_apt_params

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 784926841a40d6821f36dc728880b8f1bedd75d6..f3e2bfda040c82f3890fce47947949590c04c338 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,63 +1,63 @@
 # ppa.pp
-
 define apt::ppa(
-  $release = $::lsbdistcodename,
-  $options = '-y'
+  $ensure         = 'present',
+  $options        = $::apt::ppa_options,
+  $release        = $::apt::xfacts['lsbdistcodename'],
+  $package_name   = $::apt::ppa_package,
+  $package_manage = false,
 ) {
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-
-  if ! $release {
+  unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  if $::apt::xfacts['lsbdistid'] == 'Debian' {
+    fail('apt::ppa is not currently supported on Debian.')
+  }
+
   $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 {
+      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 = $apt::proxy_host
-    $proxy_port = $apt::proxy_port
-    case  $proxy_host {
-      false, '': {
-        $proxy_env = []
+    $_proxy = $::apt::_proxy
+    if $_proxy['host'] {
+      if $_proxy['https'] {
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
+      } else {
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
       }
-      default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+    } else {
+      $_proxy_env = []
     }
-  } 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}"],
-  }
+    exec { "add-apt-repository-${name}":
+      environment => $_proxy_env,
+      command     => "/usr/bin/add-apt-repository ${options} ${name}",
+      unless      => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
+      user        => 'root',
+      logoutput   => 'on_failure',
+      notify      => Exec['apt_update'],
+      require     => $_require,
+    }
 
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::ppa::${name}":
-    require => Class['apt::update'],
+    file { "${::apt::sources_list_d}/${sources_list_d_filename}":
+      ensure  => file,
+      require => Exec["add-apt-repository-${name}"],
+    }
+  }
+  else {
+    file { "${::apt::sources_list_d}/${sources_list_d_filename}":
+      ensure => 'absent',
+      notify => Exec['apt_update'],
+    }
   }
 }