Merge branch 'master' of git://labs.riseup.net/shared-apt

This commit is contained in:
varac 2012-12-19 09:40:53 +01:00
commit ffb44c91db
4 changed files with 25 additions and 6 deletions

9
README
View file

@ -155,6 +155,15 @@ $apt_repos
If this variable is set the default repositories list ("main contrib non-free")
is overriden.
$apt_disable_update
-------------------
Disable "apt-get update" which is normally triggered by apt::upgrade_package
and apt::dist_upgrade.
Note that nodes can be updated once a day by using
APT::Periodic::Update-Package-Lists "1";
in i.e. /etc/apt/apt.conf.d/80_apt_update_daily.
Classes
=======

View file

@ -1,6 +1,8 @@
class apt::dist_upgrade {
include apt::update
if $apt::disable_update == false {
include apt::update
}
exec { 'apt_dist-upgrade':
command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",

View file

@ -40,6 +40,11 @@ class apt {
'' => 'http://archive.ubuntu.com/ubuntu',
default => "${apt_ubuntu_url}",
}
$disable_update = $apt_disable_update ? {
'' => false,
default => $apt_disable_update
}
case $operatingsystem {
'debian': {
$repos = $apt_repos ? {

View file

@ -1,6 +1,8 @@
define apt::upgrade_package ($version = "") {
include apt::update
if $apt::disable_update == false {
include apt::update
}
$version_suffix = $version ? {
'' => '',
@ -24,10 +26,11 @@ define apt::upgrade_package ($version = "") {
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'],
Package['apt-show-versions', 'dctrl-tools'],
],
require => $apt::disable_update ? {
true => Package['apt-show-versions', 'dctrl-tools'],
default => [ Exec['apt_updated'],
Package['apt-show-versions', 'dctrl-tools'] ],
}
}
}