aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystems')
-rw-r--r--manifests/subsystems/pam.pp1
-rw-r--r--manifests/subsystems/utils/laptop.pp18
-rw-r--r--manifests/subsystems/utils/multimedia.pp14
-rw-r--r--manifests/subsystems/utils/network.pp19
4 files changed, 16 insertions, 36 deletions
diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index dc326a1..206a5c3 100644
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -2,6 +2,7 @@ class pam(
$enable = hiera('nodo::pam::enable', false)
) {
if $enable != false {
+
# Squeeze only
if $::lsbdistcodename == 'squeeze' {
# pam - login
diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index 12ee1c8..0cb7c0c 100644
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -37,22 +37,4 @@ class utils::laptop::debian {
}
}
- # Lenny specific packages
- package { [ 'madwifi-source', 'madwifi-tools', 'bluez-gnome' ]:
- ensure => $::lsbdistcodename ? {
- 'lenny' => installed,
- default => absent,
- }
- }
-
- # Hibernation on lenny
- if $::lsbdistcodename == 'lenny' {
- $hibernate = hiera('nodo::laptop::hibernate', false)
- package { 'uswsusp':
- ensure => $hibernate ? {
- false => absent,
- default => present,
- },
- }
- }
}
diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index a61c2bf..811682b 100644
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -1,10 +1,7 @@
# Multimedia utilities
class utils::multimedia::studio {
package { [ 'ardour', 'hydrogen', ]:
- ensure => $::lsbdistcodename ? {
- 'lenny' => absent,
- default => installed,
- }
+ ensure => installed,
}
# CD writers and extractors
@@ -19,7 +16,7 @@ class utils::multimedia {
'gqview', 'mpg123', 'audacious', 'qjackctl',
'gimp', 'xine-ui', 'v4l-utils', 'inkscape',
'easytag', 'gstreamer-tools', 'vlc', 'audacity',
- 'opencubicplayer', 'youtube-dl', 'mencoder', 'libasound2-plugins'
+ 'opencubicplayer', 'youtube-dl', 'mencoder', 'libasound2-plugins',
'cbrpager', 'llgal', 'darksnow', 'mplayer',
'picard', 'ffmpeg2theora', 'oggfwd', 'jhead' ]:
ensure => installed,
@@ -46,9 +43,14 @@ class utils::multimedia {
}
}
+ # Flash
+ package { 'browser-plugin-gnash':
+ ensure => installed,
+ }
+
# Flash alternative
file { "/etc/alternatives/flash-mozilla.so":
- ensure => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+ ensure => "/usr/lib/gnash/libgnashplugin.so",
owner => root,
group => root,
require => Package['flashplugin-nonfree'],
diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 6604067..0a0e9c9 100644
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -34,22 +34,22 @@ class utils::network::minimal {
class utils::network inherits utils::network::minimal {
# Network
- package { [ 'mutt', 'offlineimap', 'epiphany-browser',
+ package { [ 'mutt', 'offlineimap',
'newsbeuter', 'nicotine', 'sshfs',
'bogofilter', 'fetchmail', 'procmail',
'msmtp', 'mairix', 'notmuch-mutt',
- 'bittorrent', 'links', 'gftp',
- 'bittornado', 'iceweasel', 'transmission',
- 'openvpn', 'amule', 'pssh',
+ 'links', 'gftp', 'iceweasel',
+ 'openvpn', 'pssh', 'mutt-patched'
'pidgin', 'pidgin-encryption', 'pidgin-openpgp',
'pidgin-otr', 'pidgin-privacy-please', 'pidgin-plugin-pack',
- 'sslscan', 'muttprofile', 'connect-proxy',
- 'mutt-patched' ]:
+ 'sslscan', 'muttprofile', 'connect-proxy' ]:
ensure => installed,
}
# Old packages
- package { [ 'silc', 'twinkle', 'konqueror']:
+ # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
+ package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
+ 'bittorrent', 'bittornado', 'xul-ext-firegpg' ]:
ensure => absent,
}
@@ -61,11 +61,6 @@ class utils::network inherits utils::network::minimal {
ensure => installed,
}
- # See http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
- package { 'xul-ext-firegpg':
- ensure => absent,
- }
-
# Not using right now
package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey' ]:
ensure => absent,