More utils refactoring

3 files changed, 137 insertions, 137 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 424bf1e..ae46554 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -64,6 +64,7 @@ import "subsystems/tunnel.pp"
 import "subsystems/monkeysphere.pp"
 import "subsystems/profile.pp"
 import "subsystems/utils.pp"
+import "subsystems/utils/debian.pp"
 import "subsystems/utils/desktop.pp"
 import "subsystems/utils/laptop.pp"
 import "subsystems/utils/multimedia.pp"
diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp
new file mode 100644
index 0000000..8e16692
--- /dev/null
+++ b/manifests/subsystems/utils/debian.pp
@@ -0,0 +1,136 @@
+class utils::personal::debian {
+  # 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,
+  }
+
+  package { [ 'iceweasel', 'sun-java6-jre', 'hplip' ]:
+    ensure => installed,
+  }
+
+  # Java alternative
+  file { "/etc/alternatives/java":
+    ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",
+    owner   => root,
+    group   => root,
+    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' ]:
+      ensure => installed,
+    }
+  }
+
+  # Gem packages
+  package { 'capistrano':
+    ensure   => installed,
+    provider => gem,
+    require  => Package['rubygems'],
+  }
+
+  # Gem packages
+  package { 'slideshow':
+    ensure   => installed,
+    provider => gem,
+    require  => Package['rubygems'],
+  }
+
+  if !defined(Package['ruby']) {
+    package { 'ruby':
+      ensure => installed,
+    }
+  }
+
+  if !defined(Package['rubygems']) {
+    package { 'rubygems':
+      ensure  => installed,
+      require => Package['ruby'],
+    }
+  }
+
+  if !defined(Package['ruby-dev']) {
+    package { 'ruby-dev':
+      ensure  => installed,
+      require => Package['ruby'],
+    }
+  }
+
+  if !defined(Package['libgpgme-ruby1.8']) {
+    package { 'libgpgme-ruby1.8':
+      ensure  => installed,
+      require => Package['ruby'],
+    }
+  }
+
+  # Flash alternative
+  file { "/etc/alternatives/flash-mozilla.so":
+    ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+    owner   => root,
+    group   => root,
+    require => Package['flashplugin-nonfree'],
+  }
+}
diff --git a/manifests/subsystems/utils/personal.pp b/manifests/subsystems/utils/personal.pp
index 96b1e0a..398b12c 100644
--- a/manifests/subsystems/utils/personal.pp
+++ b/manifests/subsystems/utils/personal.pp
@@ -1,146 +1,9 @@
 # Common utilities for personal
 class utils::personal {
-  # 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: { 
       include utils::personal::debian
     }
     default: { }
   }
-
-  # Gem packages
-  package { 'capistrano':
-    ensure   => installed,
-    provider => gem,
-    require  => Package['rubygems'],
-  }
-
-  # Gem packages
-  package { 'slideshow':
-    ensure   => installed,
-    provider => gem,
-    require  => Package['rubygems'],
-  }
-
-  if !defined(Package['ruby']) {
-    package { 'ruby':
-      ensure => installed,
-    }
-  }
-
-  if !defined(Package['rubygems']) {
-    package { 'rubygems':
-      ensure  => installed,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['ruby-dev']) {
-    package { 'ruby-dev':
-      ensure  => installed,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['libgpgme-ruby1.8']) {
-    package { 'libgpgme-ruby1.8':
-      ensure  => installed,
-      require => Package['ruby'],
-    }
-  }
-
-  # Flash alternative
-  file { "/etc/alternatives/flash-mozilla.so":
-    ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
-    owner   => root,
-    group   => root,
-    require => Package['flashplugin-nonfree'],
-  }
-}
-
-class utils::personal::debian {
-  package { [ 'iceweasel', 'sun-java6-jre', 'hplip' ]:
-    ensure => installed,
-  }
-
-  # Java alternative
-  file { "/etc/alternatives/java":
-    ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",
-    owner   => root,
-    group   => root,
-    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' ]:
-      ensure => installed,
-    }
-  }
 }