X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=6b025d7a72bea1ff2fb18701cc9d481375bd4560;hb=a71dfd168296f12207749131d4f734ae671622a4;hp=a41c814f296e4a4f4c8f4462208ec3242e345a69;hpb=ee5d762351564203dec6637fb7e1547771eb03f4;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index a41c814..6b025d7 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,21 +1,69 @@
 # ppa.pp
+define apt::ppa(
+  $ensure         = 'present',
+  $options        = $::apt::ppa_options,
+  $release        = $::apt::xfacts['lsbdistcodename'],
+  $package_name   = $::apt::ppa_package,
+  $package_manage = false,
+) {
+  unless $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
 
-define apt::ppa() {
-
-  Class['apt'] -> Apt::Ppa[$title]
+  if $::apt::xfacts['lsbdistid'] == 'Debian' {
+    fail('apt::ppa is not currently supported on Debian.')
+  }
 
-  exec { "apt-update-${name}":
-    command     => "/usr/bin/aptitude update",
-    refreshonly => true,
+  if versioncmp($::apt::xfacts['lsbdistrelease'], '15.10') >= 0 {
+    $distid = downcase($::apt::xfacts['lsbdistid'])
+    $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}")
+  } else {
+    $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2-${release}")
   }
 
-  exec { "add-apt-repository-${name}":
-    command => "/usr/bin/add-apt-repository ${name}",
-    notify  => Exec["apt-update-${name}"],
-    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}.*$'",
+  $filename_no_slashes      = regsubst($filename, '/', '-', 'G')
+  $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G')
+  $sources_list_d_filename  = "${filename_no_specialchars}.list"
+
+  if $ensure == 'present' {
+    if $package_manage {
+      ensure_packages($package_name)
+
+      $_require = [File['sources.list.d'], Package[$package_name]]
+    } else {
+      $_require = File['sources.list.d']
+    }
+
+    $_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']}"]
+      }
+    } else {
+      $_proxy_env = []
+    }
+
+    exec { "add-apt-repository-${name}":
+      environment => $_proxy_env,
+      command     => "/usr/bin/add-apt-repository ${options} ${name}",
+      unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}",
+      user        => 'root',
+      logoutput   => 'on_failure',
+      notify      => Class['apt::update'],
+      require     => $_require,
+    }
+
+    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 => Class['apt::update'],
     }
   }
 }
-