diff options
-rw-r--r-- | manifests/apt_conf.pp | 1 | ||||
-rw-r--r-- | manifests/cron/dist_upgrade.pp | 1 | ||||
-rw-r--r-- | manifests/dist_upgrade.pp | 1 | ||||
-rw-r--r-- | manifests/dist_upgrade/initiator.pp | 1 | ||||
-rw-r--r-- | manifests/dot_d_directories.pp | 4 | ||||
-rw-r--r-- | manifests/dselect.pp | 1 | ||||
-rw-r--r-- | manifests/init.pp | 1 | ||||
-rw-r--r-- | manifests/preferences.pp | 1 | ||||
-rw-r--r-- | manifests/reboot_required_notify.pp | 1 | ||||
-rw-r--r-- | manifests/reboot_required_notify/jessie.pp | 1 | ||||
-rw-r--r-- | manifests/reboot_required_notify/wheezy.pp | 1 | ||||
-rw-r--r-- | manifests/sources_list.pp | 1 | ||||
-rw-r--r-- | manifests/update.pp | 1 | ||||
-rw-r--r-- | manifests/upgrade_package.pp | 2 |
14 files changed, 5 insertions, 13 deletions
diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp index ec6da6d..709fd23 100644 --- a/manifests/apt_conf.pp +++ b/manifests/apt_conf.pp @@ -41,5 +41,4 @@ define apt::apt_conf ( notify => Exec['apt_updated'], } } - } diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp index d3d3be3..2a46331 100644 --- a/manifests/cron/dist_upgrade.pp +++ b/manifests/cron/dist_upgrade.pp @@ -48,5 +48,4 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf mode => '0644', require => Package[cron-apt]; } - } diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp index 3061fb8..3d9b29b 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -8,5 +8,4 @@ class apt::dist_upgrade ( timeout => $timeout, before => Exec['apt_updated'] } - } diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp index eae5492..2ce83da 100644 --- a/manifests/dist_upgrade/initiator.pp +++ b/manifests/dist_upgrade/initiator.pp @@ -19,5 +19,4 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade { Exec['apt_dist-upgrade'] { subscribe +> File['apt_upgrade_initiator'], } - } diff --git a/manifests/dot_d_directories.pp b/manifests/dot_d_directories.pp index 0ace863..970cea0 100644 --- a/manifests/dot_d_directories.pp +++ b/manifests/dot_d_directories.pp @@ -1,6 +1,7 @@ +# watch .d directories and ensure they are present + class apt::dot_d_directories { - # watch .d directories and ensure they are present file { '/etc/apt/apt.conf.d': ensure => directory, @@ -11,5 +12,4 @@ class apt::dot_d_directories { checksum => mtime, notify => Exec['apt_updated']; } - } diff --git a/manifests/dselect.pp b/manifests/dselect.pp index da00c96..2e6e90b 100644 --- a/manifests/dselect.pp +++ b/manifests/dselect.pp @@ -1,5 +1,6 @@ # manage dselect, like # suppressing the annoying help texts + class apt::dselect { file_line { 'dselect_expert': diff --git a/manifests/init.pp b/manifests/init.pp index f7ef2e4..63059dd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -128,5 +128,4 @@ class apt ( # Another Semaphor for all packages to reference alias => [ 'apt_updated', 'refresh_apt'] } - } diff --git a/manifests/preferences.pp b/manifests/preferences.pp index aedd56b..d3eb780 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -16,5 +16,4 @@ class apt::preferences { require => File['/etc/apt/sources.list'], owner => root, group => 0, mode => '0644'; } - } diff --git a/manifests/reboot_required_notify.pp b/manifests/reboot_required_notify.pp index efd8aeb..3463bb4 100644 --- a/manifests/reboot_required_notify.pp +++ b/manifests/reboot_required_notify.pp @@ -7,5 +7,4 @@ class apt::reboot_required_notify { } else { class { 'apt::reboot_required_notify::wheezy': } } - } diff --git a/manifests/reboot_required_notify/jessie.pp b/manifests/reboot_required_notify/jessie.pp index 2de6b62..b8800a3 100644 --- a/manifests/reboot_required_notify/jessie.pp +++ b/manifests/reboot_required_notify/jessie.pp @@ -24,5 +24,4 @@ class apt::reboot_required_notify::jessie ($ensure = present) { ensure => $ensure, require => Apt::Preferences_snippet['reboot-notifier'], } - } diff --git a/manifests/reboot_required_notify/wheezy.pp b/manifests/reboot_required_notify/wheezy.pp index 06998ef..1ad46cd 100644 --- a/manifests/reboot_required_notify/wheezy.pp +++ b/manifests/reboot_required_notify/wheezy.pp @@ -19,5 +19,4 @@ class apt::reboot_required_notify::wheezy ($ensure = present) { minute => 20, require => Package['update-notifier-common'], } - } diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp index 22bc110..2fc7111 100644 --- a/manifests/sources_list.pp +++ b/manifests/sources_list.pp @@ -1,4 +1,5 @@ # Configure an apt source + define apt::sources_list ( $ensure = 'present', $source = undef, diff --git a/manifests/update.pp b/manifests/update.pp index dde8320..d5fd539 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -3,5 +3,4 @@ class apt::update inherits ::apt { Exec['update_apt'] { refreshonly => false } - } diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index 54dbff6..f739f07 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -1,5 +1,6 @@ # Install a package either to a certain version, or while making sure that it's # always the latest version that's installed. + define apt::upgrade_package ( $version = '', ) { @@ -27,5 +28,4 @@ define apt::upgrade_package ( require => Package['apt-show-versions', 'dctrl-tools'], before => Exec['apt_updated'] } - } |