aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-24 13:24:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-02-24 13:24:34 -0300
commitbbd5cdc8f67f4e8497f5793fa30d8196b5ddc144 (patch)
tree476c6424c454bf0f107a323e5a5e15bafbb148d5 /manifests
parentbf2cb9f722855ec3353e3170fba03488d5009818 (diff)
downloadpuppet-nodo-bbd5cdc8f67f4e8497f5793fa30d8196b5ddc144.tar.gz
puppet-nodo-bbd5cdc8f67f4e8497f5793fa30d8196b5ddc144.tar.bz2
Sorting utils
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystems/utils.pp99
1 files changed, 65 insertions, 34 deletions
diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index 15ebf31..a32c695 100644
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -45,44 +45,67 @@ class utils::web {
# Common utilities for personal
class utils::personal {
- package { [ 'awesome', 'alsa-tools-gui', 'mutt',
- 'irssi', 'offlineimap', 'wyrd',
- 'mp3blaster', 'eterm', 'epiphany-browser',
- 'libpam-mount', 'debhelper', 'fluxbox',
- 'gdm', 'ecryptfs-utils', 'newsbeuter',
- 'bitlbee', 'nicotine', 'silc',
- 'irssi-plugin-silc', 'conky', 'rxvt',
- 'vim-gtk', 'gobby', 'bogofilter',
- 'gnupg-agent', 'xterm', 'bash-completion',
- 'fetchmail', 'apg', 'xfonts-terminus',
- 'gnumeric', 'alsa-utils', 'sc',
- 'procmail', 'msmtp', 'netpbm',
- 'gqview', 'antiword', 'mairix',
- 'gitk', 'konqueror', 'mpg123',
- 'audacious', 'qjackctl', 'bittorrent',
- 'subversion', 'fortunes-br', 'xine-ui',
- 'broffice.org', 'cups-client', 'xscreensaver',
- 'amarok', 'mc', 'wodim',
- 'genisoimage', 'dvd+rw-tools', 'inkscape',
- 'python-stdeb', 'openjdk-6-jre', 'unrar',
- 'fakeroot', 'dupload', 'autotools-dev',
- 'dh-make', 'kalarm', 'makepasswd',
- 'pwgen', 'texlive-latex-base', 'texlive-latex-recommended',
- 'texlive-latex-extra', 'gawk', 'fpm2',
- 'irssi-scripts', 'links', 'pandoc',
- 'rxvt-unicode', 'recode', 'twinkle',
- 'figlet', 'bittornado', 'encfs',
- 'rtorrent', 'p7zip-full', 'signing-party',
- 'easytag', 'flashplugin-nonfree', 'mercurial',
- 'jhead', 'unison', 'exuberant-ctags',
- 'tig', 'gtk-theme-switch', 'gtk-smooth-themes',
- 'doxygen' ]:
+ # System
+ package { [ 'libpam-mount', 'ecryptfs-utils', 'openjdk-6-jre', 'gawk', ]:
+ ensure => installed,
+ }
+
+ # Multimedia
+ package { [ 'alsa-tools-gui', 'mp3blaster', 'alsa-utils', 'netpbm',
+ 'gqview', 'mpg123', 'audacious', 'qjackctl',
+ 'gimp', 'xine-ui', 'amarok', 'wodim',
+ 'genisoimage', 'dvd+rw-tools', 'inkscape', 'jhead',
+ 'easytag', 'flashplugin-nonfree', ]:
+ ensure => installed,
+ }
+
+ # Interface
+ package { [ 'awesome', 'eterm', 'fluxbox', 'gdm', 'conky',
+ 'xterm', 'bash-completion', 'xfonts-terminus', 'xscreensaver' 'rxvt-unicode',
+ 'mc', 'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt', ]:
+ ensure => installed,
+ }
+
+ # Office
+ package { [ 'wyrd', 'vim-gtk', 'gobby',
+ 'sc', 'antiword', 'broffice.org',
+ 'kalarm', 'texlive-latex-base', 'texlive-latex-recommended',
+ 'texlive-latex-extra', 'pandoc', 'gnumeric',
+ 'cups-client', ]:
+ ensure => installed,
+ }
+
+ # Network
+ package { [ 'mutt', 'irssi', 'offlineimap', 'epiphany-browser',
+ 'newsbeuter', 'bitlbee', 'nicotine', 'silc',
+ 'irssi-plugin-silc', 'bogofilter', 'fetchmail', 'procmail',
+ 'msmtp', 'mairix', 'konqueror,' 'bittorrent',
+ 'irssi-scripts', 'links', 'twinkle', 'bittornado',
+ 'rtorrent', ]:
+ ensure => installed,
+ }
+
+ # Security
+ package { [ 'apg', 'gnupg-agent', 'makepasswd', 'pwgen', 'fpm2', 'encfs',
+ 'signing-party', ]:
+ ensure => installed,
+ }
+
+ # Development
+ package { [ 'debhelper', 'gitk', 'git-gui', 'subversion', 'python-stdeb',
+ 'fakeroot', 'dupload', 'autotools-dev', 'dh-make', 'doxygen',
+ 'tig', 'mercurial', 'exuberant-ctags', 'reportbug', ]:
+ ensure => installed,
+ }
+
+ # Other
+ package { [ 'fortunes-br', 'unrar', 'recode', 'figlet', 'p7zip-full', 'unison', ]:
ensure => installed,
}
case $operatingsystem {
debian: {
- package { [ 'mozilla-firefox-adblock', 'iceweasel', 'sun-java6-jre', 'hplip' ]:
+ package { [ 'iceweasel', 'sun-java6-jre', 'hplip' ]:
ensure => installed,
}
@@ -94,10 +117,18 @@ class utils::personal {
require => Package['sun-java6-jre'],
}
+ # Lenny only
+ package { [ 'mozilla-firefox-adblock' ]:
+ ensure => $lsbdistcodename ? {
+ 'lenny' => present,
+ default => absent,
+ },
+ }
+
# Squeeze (or newer) packages
if $lsbdistcodename != 'lenny' {
package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
- 'maildir-utils', 'icedtea6-plugin' ]:
+ 'maildir-utils', 'icedtea6-plugin' ]:
ensure => installed,
}
}