X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=8a3b6f5f594e136113d697f5e89e73eeb61213f0;hb=0e82e5498fcc77568b8f137626959b6c402d49fd;hp=f9296549ac4e44bd623f5794d2bfa7ffd950ad57;hpb=8530c66d77220c9080c6566de5bff6cb1bc35840;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index f929654..8a3b6f5 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', + gruop => 'root', notify => Exec['apt_update'], } }