X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=a55e1e0e5c7a075b04ee4861370d40e107a42254;hb=60e50a9b65dec94fe20734404295e28d9e434a83;hp=f9296549ac4e44bd623f5794d2bfa7ffd950ad57;hpb=2f6edabc4c0757d5ccca63b4ebd9af215c5167d5;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index f929654..a55e1e0 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -3,7 +3,7 @@ define apt::ppa( $ensure = 'present', $release = $::lsbdistcodename, - $options = '-y' + $options = $apt::params::ppa_options, ) { include apt::params include apt::update @@ -14,6 +14,10 @@ define apt::ppa( 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') @@ -63,6 +67,9 @@ define apt::ppa( file { "${sources_list_d}/${sources_list_d_filename}": ensure => 'absent', + mode => '0644', + owner => 'root', + group => 'root', notify => Exec['apt_update'], } }