aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/base/physical.pp14
-rw-r--r--manifests/utils/development/debian.pp13
-rw-r--r--manifests/utils/office/console.pp18
-rw-r--r--manifests/utils/virtual.pp5
4 files changed, 44 insertions, 6 deletions
diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp
index 936a21f..2f63094 100644
--- a/manifests/base/physical.pp
+++ b/manifests/base/physical.pp
@@ -5,7 +5,19 @@ class nodo::base::physical inherits nodo::base::host {
class { 'smartmontools': }
}
- package { [ 'lm-sensors', 'hddtemp' ]:
+ package { [ 'lm-sensors', ]:
ensure => present,
}
+
+ # Deprecated
+ package { [
+ 'hddtemp',
+ ]:
+ ensure => $::lsbdistcodename ? {
+ 'wheezy' => present,
+ 'buster' => present,
+ 'bullseye' => present,
+ default => absent,
+ }
+ }
}
diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 05d16b8..4f0831b 100644
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -16,7 +16,6 @@ class nodo::utils::development::debian (
'build-essential',
'dh-buildinfo',
'quilt',
- 'dpatch',
'dput',
'debian-goodies',
'gem2deb',
@@ -34,4 +33,16 @@ class nodo::utils::development::debian (
]:
ensure => $ensure,
}
+
+ # Deprecated
+ package { [
+ 'dpatch',
+ ]:
+ ensure => $::lsbdistcodename ? {
+ 'wheezy' => present,
+ 'buster' => present,
+ 'bullseye' => present,
+ default => absent,
+ }
+ }
}
diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp
index 996d457..57d6e46 100644
--- a/manifests/utils/office/console.pp
+++ b/manifests/utils/office/console.pp
@@ -2,7 +2,7 @@ class nodo::utils::office::console (
$ensure = 'installed',
) {
package { [
- 'vim-gtk',
+ 'vim-gtk3',
'neovim',
'wyrd',
'sc',
@@ -21,4 +21,20 @@ class nodo::utils::office::console (
]:
ensure => $ensure,
}
+
+ # Deprecated
+ package { [
+ 'pandoc-citeproc',
+ ]:
+ ensure => $::lsbdistcodename ? {
+ 'wheezy' => present,
+ 'buster' => present,
+ 'bullseye' => present,
+ # Instead of removing this package, we'll let it stay
+ # for now on systems that were upgraded from previous
+ # Debian versions
+ #default => absent,
+ default => undef,
+ }
+ }
}
diff --git a/manifests/utils/virtual.pp b/manifests/utils/virtual.pp
index 2944060..f58ac05 100644
--- a/manifests/utils/virtual.pp
+++ b/manifests/utils/virtual.pp
@@ -3,9 +3,8 @@ class nodo::utils::virtual (
) {
package { [
# For running virtual machines
- 'qemu',
- #'qemu-kvm',
- 'qemu-system-x86',
+ 'qemu-kvm',
+ #'qemu-system-x86',
'libguestfs-tools',
#'virtualbox-guest-additions-iso',