diff options
| -rw-r--r-- | manifests/apticron.pp | 2 | ||||
| -rw-r--r-- | manifests/config.pp | 8 | ||||
| -rw-r--r-- | manifests/cron/dist_upgrade.pp | 4 | ||||
| -rw-r--r-- | manifests/dist_upgrade.pp | 2 | ||||
| -rw-r--r-- | manifests/dselect.pp | 2 | ||||
| -rw-r--r-- | manifests/install.pp | 2 | ||||
| -rw-r--r-- | manifests/listchanges.pp | 2 | ||||
| -rw-r--r-- | manifests/preferences_snippet.pp | 6 | ||||
| -rw-r--r-- | manifests/preseeded_package.pp | 2 | ||||
| -rw-r--r-- | manifests/unattended_upgrades.pp | 4 | ||||
| -rw-r--r-- | manifests/update.pp | 2 | ||||
| -rw-r--r-- | manifests/upgrade_package.pp | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/manifests/apticron.pp b/manifests/apticron.pp index a8a24be..7dbbfb6 100644 --- a/manifests/apticron.pp +++ b/manifests/apticron.pp @@ -13,7 +13,7 @@ class apt::apticron ( ) { package { 'apticron': - ensure => $ensure_version + ensure => $ensure_version; } file { '/etc/apticron/apticron.conf': diff --git a/manifests/config.pp b/manifests/config.pp index 416aabc..4c5c5d3 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -10,7 +10,7 @@ class apt::config inherits apt { $sources_content = $custom_sources_list ? { '' => template( "apt/${::operatingsystem}/sources.list.erb"), - default => $custom_sources_list + default => $custom_sources_list; } file { # include main and security @@ -34,7 +34,7 @@ class apt::config inherits apt { ::apt::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/apt/02show_upgraded' ]; } if ( $::virtual == 'vserver' ) { @@ -49,7 +49,7 @@ class apt::config inherits apt { ::apt::apt_conf { '03clean': source => [ "puppet:///modules/site_apt/${::fqdn}/03clean", 'puppet:///modules/site_apt/03clean', - 'puppet:///modules/apt/03clean' ] + 'puppet:///modules/apt/03clean' ]; } } @@ -82,7 +82,7 @@ class apt::config inherits apt { } if $custom_preferences != false { Exec['custom_keys'] { - before => File['apt_config'] + before => File['apt_config']; } } } diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp index 2a46331..39db07a 100644 --- a/manifests/cron/dist_upgrade.pp +++ b/manifests/cron/dist_upgrade.pp @@ -3,7 +3,7 @@ class apt::cron::dist_upgrade ( ) { package { 'cron-apt': - ensure => installed + ensure => installed; } case $cron_hours { @@ -30,7 +30,7 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf } package { 'apt-listbugs': - ensure => absent + ensure => absent; } file { '/etc/cron-apt/action.d/4-dist-upgrade': diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp index 38ae417..eb3207c 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -6,6 +6,6 @@ class apt::dist_upgrade ( command => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade', refreshonly => true, timeout => $timeout, - before => Exec['update_apt'] + before => Exec['update_apt']; } } diff --git a/manifests/dselect.pp b/manifests/dselect.pp index 2e6e90b..beee9ee 100644 --- a/manifests/dselect.pp +++ b/manifests/dselect.pp @@ -9,6 +9,6 @@ class apt::dselect { } package { 'dselect': - ensure => installed + ensure => installed; } } diff --git a/manifests/install.pp b/manifests/install.pp index 5f33d11..76eb570 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,7 +1,7 @@ class apt::install { package { 'apt': - ensure => present, + ensure => present; } # This package should really always be current diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp index 642986b..e2b77be 100644 --- a/manifests/listchanges.pp +++ b/manifests/listchanges.pp @@ -9,7 +9,7 @@ class apt::listchanges ( ){ package { 'apt-listchanges': - ensure => $ensure_version + ensure => $ensure_version; } file { '/etc/apt/listchanges.conf': diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp index eee1511..1462dbe 100644 --- a/manifests/preferences_snippet.pp +++ b/manifests/preferences_snippet.pp @@ -40,19 +40,19 @@ define apt::preferences_snippet ( case $release { undef: { 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'); } } } } default: { File["/etc/apt/preferences.d/${name}"]{ - source => $source + source => $source; } } } diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp index 5a2979f..3c69f9b 100644 --- a/manifests/preseeded_package.pp +++ b/manifests/preseeded_package.pp @@ -8,7 +8,7 @@ define apt::preseeded_package ( $seedfile = "/var/cache/local/preseeding/${name}.seeds" $real_content = $content ? { '' => template ( "site_apt/${::debian_codename}/${name}.seeds" ), - default => $content + default => $content; } file { $seedfile: diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 85d21d4..4067044 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -23,12 +23,12 @@ class apt::unattended_upgrades ( $file_content = $config_content ? { undef => template($config_template), - default => $config_content + default => $config_content; } ::apt::apt_conf { '50unattended-upgrades': content => $file_content, require => Package['unattended-upgrades'], - refresh_apt => false + refresh_apt => false; } } diff --git a/manifests/update.pp b/manifests/update.pp index d5fd539..4cb4e5f 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -1,6 +1,6 @@ class apt::update inherits ::apt { Exec['update_apt'] { - refreshonly => false + refreshonly => false; } } diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index a96db7c..079fc3b 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -26,6 +26,6 @@ define apt::upgrade_package ( 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 => Package['apt-show-versions', 'dctrl-tools'], - before => Exec['update_apt'] + before => Exec['update_apt']; } } |