Merge branch '1.4.x'

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index af6eebff0a4064ec35a52d178a570c4222b41609..bc8d486007980a1770884ffa91d8bce06b90b421 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,24 +1,78 @@
 # ppa.pp
 
-define apt::ppa() {
+define apt::ppa(
+  $ensure  = 'present',
+  $release = $::lsbdistcodename,
+  $options = $apt::params::ppa_options,
+) {
+  include apt::params
+  include apt::update
 
-  Class['apt'] -> Apt::Ppa[$title]
+  $sources_list_d = $apt::params::sources_list_d
 
-  Exec {
-    unless => $name? {
-      /ppa:(.*)/ => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*ppa.*$1.*$'",
-      default    => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*${title}.*$'",
+  if ! $release {
+    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"
+
+  if $ensure == 'present' {
+    $package = $::lsbdistrelease ? {
+        /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
+        default  => 'software-properties-common',
+    }
+
+    if ! defined(Package[$package]) {
+        package { $package: }
+    }
+
+    if defined(Class[apt]) {
+        $proxy_host = $apt::proxy_host
+        $proxy_port = $apt::proxy_port
+        case  $proxy_host {
+        false, '': {
+            $proxy_env = []
+        }
+        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      => [
+        File['sources.list.d'],
+        Package[$package],
+        ],
+    }
+
+    file { "${sources_list_d}/${sources_list_d_filename}":
+        ensure  => file,
+        require => Exec["add-apt-repository-${name}"],
     }
   }
+  else {
 
-  exec { "apt-update-${name}":
-    command     => "/usr/bin/aptitude update",
-    refreshonly => true,
+    file { "${sources_list_d}/${sources_list_d_filename}":
+        ensure => 'absent',
+        notify => Exec['apt_update'],
+    }
   }
 
-  exec { "add-apt-repository-${name}":
-    command => "/usr/bin/add-apt-repository ${name}",
-    notify  => Exec["apt-update-${name}"],
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::ppa::${name}":
+    require => Class['apt::update'],
   }
 }
-