# apparently doesn't.
file { "/etc/apt/apt.conf.d/${name}":
ensure => $ensure,
- owner => root, group => 0, mode => 0644,
- notify => Exec["refresh_apt"],
+ owner => root,
+ group => 0,
+ mode => '0644',
+ notify => Exec['refresh_apt'],
}
if $source {
$customsubject = ''
) {
- package { apticron: ensure => $ensure_version }
+ package { 'apticron': ensure => $ensure_version }
- file { "/etc/apticron/apticron.conf":
+ file { '/etc/apticron/apticron.conf':
content => template($apt::apticron::config),
- mode => 0644, owner => root, group => root,
- require => Package["apticron"];
+ owner => root,
+ group => root,
+ mode => '0644',
+ require => Package['apticron'];
}
}
class apt::cron::base {
- package { cron-apt: ensure => installed }
+ package { 'cron-apt': ensure => installed }
case $apt_cron_hours {
'': {}
dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
"
- file { "/etc/cron-apt/action.d/3-download":
+ file { '/etc/cron-apt/action.d/3-download':
ensure => absent,
}
- package { "apt-listbugs": ensure => absent }
+ package { 'apt-listbugs': ensure => absent }
- file { "/etc/cron-apt/action.d/4-dist-upgrade":
+ file { '/etc/cron-apt/action.d/4-dist-upgrade':
content => $action,
- require => Package[cron-apt],
- owner => root, group => 0, mode => 0644;
+ owner => root,
+ group => 0,
+ mode => '0644',
+ require => Package[cron-apt];
}
- file { "/etc/cron-apt/config.d/MAILON":
- content => "MAILON=upgrade\n",
- require => Package[cron-apt],
- owner => root, group => 0, mode => 0644;
+ file { '/etc/cron-apt/config.d/MAILON':
+ content => 'MAILON=upgrade\n',
+ owner => root,
+ group => 0,
+ mode => '0644',
+ require => Package[cron-apt];
}
}
dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
"
- file { "/etc/cron-apt/action.d/4-dist-upgrade":
+ file { '/etc/cron-apt/action.d/4-dist-upgrade':
ensure => absent,
}
- file { "/etc/cron-apt/action.d/3-download":
+ file { '/etc/cron-apt/action.d/3-download':
content => $action,
require => Package[cron-apt],
- owner => root, group => 0, mode => 0644;
+ owner => root,
+ group => 0,
+ mode => '0644';
}
- file { "/etc/cron-apt/config.d/MAILON":
+ file { '/etc/cron-apt/config.d/MAILON':
content => "MAILON=changes\n",
require => Package[cron-apt],
- owner => root, group => 0, mode => 0644;
+ owner => root,
+ group => 0,
+ mode => '0644';
}
}
include apt::update
}
+ $req = $apt::disable_update ? {
+ true => undef,
+ default => Exec['apt_updated'],
+ }
+
exec { 'apt_dist-upgrade':
- command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
+ command => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade',
refreshonly => true,
- require => $apt::disable_update ? {
- true => undef,
- default => Exec['apt_updated'],
- }
+ require => $req
}
}
$initiator_abs = "${apt::apt_base_dir}/${initiator}"
file { 'apt_upgrade_initiator':
- mode => 0644,
+ mode => '0644',
owner => root,
group => 0,
- path => "${initiator_abs}",
+ path => $initiator_abs,
checksum => md5,
source => [
- "puppet:///modules/site_apt/${::fqdn}/${initiator}",
- "puppet:///modules/site_apt/${initiator}",
- "puppet:///modules/apt/${initiator}",
+ "puppet:///modules/site_apt/${::fqdn}/${initiator}",
+ "puppet:///modules/site_apt/${initiator}",
+ "puppet:///modules/apt/${initiator}",
],
}
# watch .d directories and ensure they are present
file {
- "/etc/apt/apt.conf.d":
- ensure => directory,
+ '/etc/apt/apt.conf.d':
+ ensure => directory,
checksum => mtime,
- notify => Exec['refresh_apt'];
- "/etc/apt/sources.list.d":
- ensure => directory,
+ notify => Exec['refresh_apt'];
+ '/etc/apt/sources.list.d':
+ ensure => directory,
checksum => mtime,
- notify => Exec['refresh_apt'];
+ notify => Exec['refresh_apt'];
}
exec {
# "&& sleep 1" is workaround for older(?) clients
'refresh_apt':
- command => '/usr/bin/apt-get update && sleep 1',
+ command => '/usr/bin/apt-get update && sleep 1',
refreshonly => true,
}
class apt::dselect {
# suppress annoying help texts of dselect
- line { dselect_expert:
- file => "/etc/dpkg/dselect.cfg",
- line => "expert",
+ line { 'dselect_expert':
+ file => '/etc/dpkg/dselect.cfg',
+ line => 'expert',
}
- package { dselect: ensure => installed }
+ package { 'dselect': ensure => installed }
}
case $::operatingsystem {
'debian': {
$real_repos = $repos ? {
- 'auto' => 'main contrib non-free',
+ 'auto' => 'main contrib non-free',
default => $repos,
}
}
}
}
- package { apt:
- ensure => installed,
+ package { 'apt':
+ ensure => installed,
require => undef,
}
# init $release, $next_release, $next_codename, $release_version
case $codename {
'n/a': {
- fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
+ fail("Unknown lsbdistcodename reported by facter: '$::lsbdistcodename', please fix this by setting this variable in your manifest.")
}
default: {
$release = debian_release($codename)
$next_codename = debian_nextcodename($codename)
$next_release = debian_nextrelease($release)
+ $sources_content = $::custom_sources_list ? {
+ '' => template( "apt/${::operatingsystem}/sources.list.erb"),
+ default => $::custom_sources_list
+ }
file {
# include main, security and backports
# additional sources should be included via the apt::sources_list define
- "/etc/apt/sources.list":
- content => $custom_sources_list ? {
- '' => template( "apt/${::operatingsystem}/sources.list.erb"),
- default => $custom_sources_list
- },
+ '/etc/apt/sources.list':
+ content => $sources_content,
require => Package['lsb'],
- notify => Exec['refresh_apt'],
- owner => root, group => 0, mode => 0644;
+ notify => Exec['refresh_apt'],
+ owner => root,
+ group => 0,
+ mode => '0644';
}
- apt_conf { "02show_upgraded":
+ apt_conf { '02show_upgraded':
source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
- "puppet:///modules/site_apt/02show_upgraded",
- "puppet:///modules/apt/02show_upgraded" ]
+ 'puppet:///modules/site_apt/02show_upgraded',
+ 'puppet:///modules/apt/02show_upgraded' ]
}
- if ( $::virtual == "vserver" ) {
- apt_conf { "03clean_vserver":
+ if ( $::virtual == 'vserver' ) {
+ apt_conf { '03clean_vserver':
source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
- "puppet:///modules/site_apt/03clean_vserver",
- "puppet:///modules/apt/03clean_vserver" ],
- alias => "03clean";
+ 'puppet:///modules/site_apt/03clean_vserver',
+ 'puppet:///modules/apt/03clean_vserver' ],
+ alias => '03clean';
}
}
else {
- apt_conf { "03clean":
+ apt_conf { '03clean':
source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
- "puppet:///modules/site_apt/03clean",
- "puppet:///modules/apt/03clean" ]
+ 'puppet:///modules/site_apt/03clean',
+ 'puppet:///modules/apt/03clean' ]
}
}
-
+
case $custom_preferences {
false: {
include apt::preferences::absent
include apt::dot_d_directories
## This package should really always be current
- package { "debian-archive-keyring": ensure => latest }
+ package { 'debian-archive-keyring': ensure => latest }
# backports uses the normal archive key now
- package { "debian-backports-keyring": ensure => absent }
+ package { 'debian-backports-keyring': ensure => absent }
+
+ include common::moduledir
+ $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
+ modules_dir { 'apt': }
- if $custom_key_dir {
+ if $::custom_key_dir {
file { "${apt_base_dir}/keys.d":
- source => "$custom_key_dir",
+ source => $::custom_key_dir,
recurse => true,
- mode => 0755, owner => root, group => root,
+ owner => root,
+ group => root,
+ mode => '0755',
}
- exec { "custom_keys":
- command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update",
- subscribe => File["${apt_base_dir}/keys.d"],
+ exec { 'custom_keys':
+ command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update",
+ subscribe => File["${apt_base_dir}/keys.d"],
refreshonly => true,
}
if $custom_preferences != false {
- Exec["custom_keys"] {
+ Exec['custom_keys'] {
before => File['apt_config'],
}
}
}
# workaround for preseeded_package component
- file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory }
+ file { [ '/var/cache', '/var/cache/local', '/var/cache/local/preseeding' ]: ensure => directory }
}
$saveseen = '/var/lib/apt/listchanges.db',
$which = 'both'
){
- package { apt-listchanges: ensure => $ensure_version }
-
- file { "/etc/apt/listchanges.conf":
+ package { 'apt-listchanges': ensure => $ensure_version }
+
+ file { '/etc/apt/listchanges.conf':
content => template($apt::listchanges::config),
- mode => 0644, owner => root, group => root,
- require => Package["apt-listchanges"];
+ owner => root,
+ group => root,
+ mode => '0644',
+ require => Package['apt-listchanges'];
}
}
class apt::preferences {
- $pref_contents = $custom_preferences ? {
- '' => $operatingsystem ? {
+ $pref_contents = $apt::custom_preferences ? {
+ '' => $::operatingsystem ? {
'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
},
- default => $custom_preferences
+ default => $apt::custom_preferences
}
file { '/etc/apt/preferences':
- ensure => present,
- alias => 'apt_config',
+ ensure => present,
+ alias => 'apt_config',
# only update together
content => $pref_contents,
- require => File["/etc/apt/sources.list"],
- owner => root, group => 0, mode => 0644;
+ require => File['/etc/apt/sources.list'],
+ owner => root, group => 0, mode => '0644';
}
}
class apt::preferences::absent {
file { '/etc/apt/preferences':
- alias => 'apt_config',
ensure => absent,
+ alias => 'apt_config',
}
}
-define apt::preferences_snippet(
+define apt::preferences_snippet (
+ $priority,
$package = false,
$ensure = 'present',
$source = '',
$release = '',
- $pin = '',
- $priority )
-{
+ $pin = ''
+) {
$real_package = $package ? {
false => $name,
}
if $custom_preferences == false {
- fail("Trying to define a preferences_snippet with \$custom_preferences set to false.")
+ fail('Trying to define a preferences_snippet with $custom_preferences set to false.')
}
if !$pin and !$release {
- fail("apt::preferences_snippet requires one of the 'pin' or 'release' argument to be set")
+ fail('apt::preferences_snippet requires one of the \'pin\' or \'release\' argument to be set')
}
if $pin and $release {
- fail("apt::preferences_snippet requires either a 'pin' or 'release' argument, not both")
+ fail('apt::preferences_snippet requires either a \'pin\' or \'release\' argument, not both')
}
file { "/etc/apt/preferences.d/${name}":
ensure => $ensure,
- owner => root, group => 0, mode => 0644;
+ owner => root, group => 0, mode => '0644';
}
# This should really work in the same manner as sources_list and apt_conf
case $release {
'': {
File["/etc/apt/preferences.d/${name}"]{
- content => template("apt/preferences_snippet.erb")
+ content => template('apt/preferences_snippet.erb')
}
}
default: {
File["/etc/apt/preferences.d/${name}"]{
- content => template("apt/preferences_snippet_release.erb")
+ content => template('apt/preferences_snippet_release.erb')
}
}
}
-define apt::preseeded_package ($content = "", $ensure = "installed") {
+define apt::preseeded_package (
+ $ensure = 'installed',
+ $content = ''
+) {
$seedfile = "/var/cache/local/preseeding/${name}.seeds"
+ $real_content = $content ? {
+ '' => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
+ default => $content
+ }
file { $seedfile:
- content => $content ? {
- "" => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
- default => $content
- },
- mode => 0600, owner => root, group => root,
- }
+ content => $real_content,
+ mode => '0600', owner => root, group => root,
+ }
package { $name:
- ensure => $ensure,
+ ensure => $ensure,
responsefile => $seedfile,
- require => File[$seedfile],
- }
-}
+ require => File[$seedfile],
+ }
+}
$port = '3142',
){
- apt_conf { "20proxy":
- content => template("apt/20proxy.erb"),
+ apt_conf { '20proxy':
+ content => template('apt/20proxy.erb'),
}
}
# This package installs the script that created /var/run/reboot-required*.
# This script (/usr/share/update-notifier/notify-reboot-required) is
# triggered e.g. by kernel packages.
- package { update-notifier-common:
+ package { 'update-notifier-common':
ensure => installed,
}
define apt::sources_list (
$ensure = 'present',
$source = '',
- $content = undef )
-{
+ $content = undef
+) {
if $source == '' and $content == undef {
fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}")
# apparently doesn't.
file { "/etc/apt/sources.list.d/${name}":
ensure => $ensure,
- owner => root, group => 0, mode => 0644,
+ owner => root, group => 0, mode => '0644',
notify => Exec['refresh_apt'],
}
class apt::unattended_upgrades {
package { 'unattended-upgrades':
- ensure => present,
+ ensure => present,
require => undef,
}
- apt_conf { "50unattended-upgrades":
+ apt_conf { '50unattended-upgrades':
source => [
- "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
- "puppet:///modules/site_apt/50unattended-upgrades",
- "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
+ "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
+ 'puppet:///modules/site_apt/50unattended-upgrades',
+ "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
require => Package['unattended-upgrades'],
}
- if $custom_preferences != false {
- Apt_conf["50unattended-upgrades"] {
- before => Concat[apt_config],
+ if $apt::custom_preferences != false {
+ Apt_conf['50unattended-upgrades'] {
+ before => Concat['apt_config'],
}
}
}
exec { 'update_apt':
command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
- require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
- File['/etc/apt/sources.list'] ],
+ require => [
+ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
+ File['/etc/apt/sources.list'] ],
loglevel => info,
# Another Semaphor for all packages to reference
- alias => "apt_updated"
+ alias => 'apt_updated'
}
}
-define apt::upgrade_package ($version = "") {
+define apt::upgrade_package (
+ $version = ''
+) {
- if $apt::disable_update == false {
- include apt::update
+ if $apt::disable_update == false {
+ include apt::update
}
$version_suffix = $version ? {
if !defined(Package['apt-show-versions']) {
package { 'apt-show-versions':
- ensure => installed,
+ ensure => installed,
require => undef,
}
}
if !defined(Package['dctrl-tools']) {
package { 'dctrl-tools':
- ensure => installed,
+ ensure => installed,
require => undef,
}
}
+ $req = $apt::disable_update ? {
+ true => Package['apt-show-versions', 'dctrl-tools'],
+ default => [
+ Exec['apt_updated'],
+ Package['apt-show-versions', 'dctrl-tools']
+ ],
+ }
+
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 => $apt::disable_update ? {
- true => Package['apt-show-versions', 'dctrl-tools'],
- default => [ Exec['apt_updated'],
- Package['apt-show-versions', 'dctrl-tools'] ],
- }
+ onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
+ require => $req
}
}
projects / puppet-apt.git / commitdiff