Merge pull request #583 from tdb/fix_ppa_pluses

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 75f0a69574368316f4540567d00b92383645391b..d6b49007608c2f6811d3d4d812b017a200727173 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,13 +1,64 @@
 # ppa.pp
-
 define apt::ppa(
-       
+  $ensure         = 'present',
+  $options        = $::apt::ppa_options,
+  $release        = $::apt::xfacts['lsbdistcodename'],
+  $package_name   = $::apt::ppa_package,
+  $package_manage = false,
 ) {
-       include apt
-       
-       exec { "/usr/bin/add-apt-repository ${name}":
-               require => Package["python-software-properties"],
-               # TODO: unless => 'check'
-       }
-}
+  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_pluses  = regsubst($filename_without_dots, '\+', '_', 'G')
+  $filename_without_ppa     = regsubst($filename_without_pluses, '^ppa:', '', 'G')
+  $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
+
+  if $ensure == 'present' {
+    if $package_manage {
+      package { $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 -s ${::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'],
+    }
+  }
+}