aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/development/puppet.pp9
-rw-r--r--manifests/utils/interface.pp2
-rw-r--r--manifests/utils/network.pp14
-rw-r--r--manifests/utils/physical.pp2
4 files changed, 21 insertions, 6 deletions
diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index 7285eae..bf26dbb 100644
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,5 +1,12 @@
class nodo::utils::development::puppet {
- package { [ 'puppet-lint', 'ruby-hiera-puppet' ]:
+ package { 'puppet-lint':
ensure => installed,
}
+
+ package { 'ruby-hiera-puppet':
+ ensure => $::lsbdistcodename ? {
+ 'wheezy' => present,
+ default => absent,
+ },
+ }
}
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index 1a1d265..235d88a 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -14,7 +14,7 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
}
# Fonts
- package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'ttf-inconsolata' ]:
+ package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'fonts-inconsolata' ]:
ensure => installed,
}
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 20d0f2b..cd64f93 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -4,7 +4,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
'newsbeuter', 'nicotine', 'sshfs',
'bogofilter', 'fetchmail', 'procmail',
'msmtp', 'mairix', 'notmuch-mutt',
- 'links', 'gftp', 'iceweasel',
+ 'links', 'iceweasel',
'openvpn', 'pssh', 'mutt-patched',
'pidgin', 'pidgin-encryption', 'pidgin-openpgp',
'pidgin-otr', 'pidgin-privacy-please', 'pidgin-plugin-pack',
@@ -34,7 +34,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
# Squeeze (or newer) packages
if $::lsbdistcodename != 'lenny' {
package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
- 'maildir-utils', 'icedtea6-plugin', 'xul-ext-noscript',
+ 'maildir-utils', 'xul-ext-noscript',
'xul-ext-firebug', 'msva-perl', 'chromium-l10n' ]:
ensure => installed,
}
@@ -63,10 +63,18 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
}
# Jessie ownwards
- #package { [ 'xul-ext-pentadactyl' ]:
+ #package { [ 'xul-ext-pentadactyl', 'xul-ext-stylish' ]:
# ensure => installed,
#}
+ # Wheezy only
+ package { [ 'gftp', 'icedtea6-plugin' ]:
+ ensure => $::lsbdistcodename ? {
+ 'lenny' => present,
+ default => absent,
+ },
+ }
+
# Lenny only
package { [ 'mozilla-firefox-adblock' ]:
ensure => $::lsbdistcodename ? {
diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp
index 07fe6fd..1fd2aff 100644
--- a/manifests/utils/physical.pp
+++ b/manifests/utils/physical.pp
@@ -2,7 +2,7 @@
class nodo::utils::physical {
package { [ 'nload', 'acpid', 'slurm', 'ethtool', 'parted', 'iftop',
'iptraf', 'htop', 'sdparm', 'iotop', 'sysstat', 'saidar',
- 'lshw', 'sg3-utils', 'nmon', 'atop' ]:
+ 'lshw', 'sg3-utils', 'nmon', 'atop', 'dcfldd' ]:
ensure => installed,
}