Merge pull request #227 from daniellawrence/file_perms_apt_ppa

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 0458589849e30ec90dcc8f7a7d6f0d73ef6f3c32..8a3b6f5f594e136113d697f5e89e73eeb61213f0 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,7 +1,9 @@
 # ppa.pp
 
 define apt::ppa(
-  $release = $::lsbdistcodename
+  $ensure  = 'present',
+  $release = $::lsbdistcodename,
+  $options = $apt::params::ppa_options,
 ) {
   include apt::params
   include apt::update
@@ -12,29 +14,64 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  $filename_without_slashes = regsubst($name, '/', '-', G)
-  $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', G)
-  $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', G)
+  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 ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
-  }
+  if $ensure == 'present' {
+    $package = $::lsbdistrelease ? {
+        /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
+        default  => 'software-properties-common',
+    }
 
-  exec { "add-apt-repository-${name}":
-    command   => "/usr/bin/add-apt-repository ${name}",
-    creates   => "${sources_list_d}/${sources_list_d_filename}",
-    logoutput => 'on_failure',
-    require   => [
-      File[$sources_list_d],
-      Package['python-software-properties'],
-    ],
-    notify    => Exec['apt_update'],
+    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 {
 
-  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 => 'absent',
+        mode   => '0644',
+        owner  => 'root',
+        gruop  => 'root',
+        notify => Exec['apt_update'],
+    }
   }
 
   # Need anchor to provide containment for dependencies.
@@ -42,4 +79,3 @@ define apt::ppa(
     require => Class['apt::update'],
   }
 }
-