diff options
| author | root <root@puppet.nadir.org> | 2011-02-16 13:23:54 +0000 |
|---|---|---|
| committer | root <root@puppet.nadir.org> | 2011-02-16 13:23:54 +0000 |
| commit | 13033f7d814fe6c006d47108b5df5e0505975010 (patch) | |
| tree | 733eafc4279e0c621b620a335f550d616402419e /manifests | |
| parent | 44c6d6aa8f394b0acf72a26ebb185595fe451159 (diff) | |
| parent | 840ea9ed9d3e0a26e5a70db2143ebb3f0fea13b4 (diff) | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/sources_list.pp | 2 | ||||
| -rw-r--r-- | manifests/upgrade_package.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp index ff8f21a..86b35a7 100644 --- a/manifests/sources_list.pp +++ b/manifests/sources_list.pp @@ -13,7 +13,7 @@ define apt::sources_list ( file { "/etc/apt/sources.list.d/${name}": ensure => $ensure, - owner => root, group => 0, mode => 0600; + owner => root, group => 0, mode => 0644; } if $source { diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index 358bd9e..9202624 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -22,7 +22,7 @@ define apt::upgrade_package ($version = "") { } } - exec { "aptitude -y install ${name}${version_suffix}": + exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}": onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ], require => [ Exec['apt_updated'], |