Creating minimum classes for network applications

diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp
index bec24e06adbb05ba721ba716b6c49e3e661ea84a..e1d4d434425b3bb2594123dba4fb18a80c4d2f59 100644 (file)
--- a/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@ -6,7 +6,7 @@ class utils::personal::debian {
   }
 
   # Misc
-  package { [ 'fortunes-br', 'unrar', 'recode', 'figlet', 'p7zip-full', 'unison', 'funcoeszz' ]:
+  package { [ 'fortunes-br', 'unrar', 'recode', 'figlet', 'p7zip-full', 'funcoeszz' ]:
     ensure => installed,
   }
 }

diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 551120fd6e5455d4d5c6ad7c6fb717fff13a85d6..ecb92c5f1671ccc8a8eaf2fc7243803a42bed1d2 100644 (file)
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -1,14 +1,35 @@
-class utils::network {
+class utils::network::irssi {
+  package { [ 'irssi', 'bitlbee', 'irssi-plugin-silc', 'irssi-scripts', 'irssi-plugin-otr' ]:
+    ensure => installed,
+  }
+}
+
+class utils::network::torrent {
+  package { [ 'rtorrent' ]:
+  }
+}
+
+class utils::network::minimal {
+  include utils::network:irssi
+  include utils::network:torrent
+
+  package { 'unison':
+    ensure => installed,
+  }
+}
+
+class utils::network inherits utils::network::mininal {
   # 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',           'iceweasel',      'irssi-plugin-otr', 'transmission',
-              'openvpn',            'amule',          'pssh',             'pidgin',
-              'pidgin-encryption',  'pidgin-openpgp', 'pidgin-otr',       'pidgin-privacy-please',
-              'pidgin-plugin-pack', 'sslscan' ]:
+  package { [ 'mutt',               'offlineimap',           'epiphany-browser',
+              'newsbeuter',         'nicotine',              'silc',
+              'bogofilter',         'fetchmail',             'procmail',
+              'msmtp',              'mairix',                'konqueror',
+              'bittorrent',         'links',                 'twinkle',
+              'bittornado',         'iceweasel',             'transmission',
+              'openvpn',            'amule',                 'pssh',
+              'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
+              'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
+              'sslscan' ]:
     ensure => installed,
   }