From 4a880ad141c8deefb41549e5e79c868303e1c296 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 23 Sep 2016 16:29:26 -0300
Subject: Coding style for utilities

---
 manifests/utils/network.pp | 118 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 92 insertions(+), 26 deletions(-)

(limited to 'manifests/utils/network.pp')

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 1d9d876..ac14727 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -1,18 +1,43 @@
 class nodo::utils::network inherits nodo::utils::network::minimal {
   # Network
-  package { [ 'mutt',               'offlineimap',           
-              'newsbeuter',         'nicotine',              'sshfs',
-              'bogofilter',         'fetchmail',             'procmail',
-              'msmtp',              'mairix',                'notmuch-mutt',
-              'links',              'elinks',                'iceweasel',
-              'openvpn',            'pssh',                  'mutt-patched',
-              'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
-              'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
-              'sslscan',            'muttprofile',           'connect-proxy',
-              'avahi-discover',     'mdns-scan',             'davfs2',
-              'surfraw',            'w3m',                   'mailplate',
-              'geoip-bin',          'ssvnc',
-              'rig',                'sup-mail' ]:
+  package { [
+    'mutt',
+    'offlineimap',
+    'newsbeuter',
+    'nicotine',
+    'sshfs',
+    'bogofilter',
+    'fetchmail',
+    'procmail',
+    'msmtp',
+    'mairix',
+    'notmuch-mutt',
+    'links',
+    'elinks',
+    'iceweasel',
+    'openvpn',
+    'pssh',
+    'mutt-patched',
+    'pidgin',
+    'pidgin-encryption',
+    'pidgin-openpgp',
+    'pidgin-otr',
+    'pidgin-privacy-please',
+    'pidgin-plugin-pack',
+    'sslscan',
+    'muttprofile',
+    'connect-proxy',
+    'avahi-discover',
+    'mdns-scan',
+    'davfs2',
+    'surfraw',
+    'w3m',
+    'mailplate',
+    'geoip-bin',
+    'ssvnc',
+    'rig',
+    'sup-mail',
+  ]:
     ensure => installed,
   }
 
@@ -24,33 +49,59 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   }
 
   # Using the addon directly
-  package { 'iceweasel-vimperator':
+  package { [
+    'iceweasel-vimperator',
+  ]:
     ensure => absent,
   }
 
   # Old packages
   # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
   # About adblock plus, see http://www.theverge.com/2015/2/2/7963577/google-ads-get-through-adblock
-  package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
-              'bittorrent', 'bittornado', 'xul-ext-firegpg',  'xul-ext-adblock-plus' ]:
+  package { [
+    'silc',
+    'twinkle',
+    'konqueror',
+    'transmission',
+    'amule',
+    'epiphany-browser',
+    'bittorrent',
+    'bittornado',
+    'xul-ext-firegpg',
+    'xul-ext-adblock-plus',
+  ]:
     ensure => absent,
   }
 
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
-    package { [ 'xul-ext-monkeysphere', 'libical-parser-perl',
-                'maildir-utils',        'xul-ext-noscript',
-                'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
+    package { [ 
+      'xul-ext-monkeysphere',
+      'libical-parser-perl',
+      'maildir-utils',
+      'xul-ext-noscript',
+      'xul-ext-firebug',
+      'msva-perl',
+      'chromium-l10n',
+    ]:
       ensure => installed,
     }
   }
 
   # Not using right now
-  package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey', 'torchat' ]:
+  package { [
+    'xul-ext-torbutton',
+    'vidalia',
+    'xul-ext-perspectives',
+    'xul-ext-greasemonkey',
+    'torchat',
+  ]:
     ensure => absent,
   }
 
-  package { 'chromium':
+  package { [
+    'chromium',
+  ]:
     ensure  => present,
     name    => $::lsbdistcodename ? {
       'wheezy' => 'chromium-browser',
@@ -60,24 +111,37 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Wheezy (or newer) packages
   if $::lsbdistcodename != 'squeeze' {
-    package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol' ]:
+    package { [ 
+      'xul-ext-https-everywhere',
+      'xul-ext-refcontrol',
+    ]:
       ensure => installed,
     }
 
     # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
     #     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
-    package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy' ]:
+    package { [
+      'xul-ext-cookie-monster',
+      'xul-ext-quickproxy',
+    ]:
       ensure => absent,
     }
   }
 
   # Jessie ownwards
-  #package { [ 'xul-ext-pentadactyl', 'xul-ext-stylish' ]:
+  #package { [
+  #  'xul-ext-pentadactyl',
+  #  'xul-ext-stylish',
+  #]:
   #  ensure => installed,
   #}
 
   # Wheezy only
-  package { [ 'gftp', 'icedtea6-plugin', 'luakit' ]:
+  package { [
+    'gftp',
+    'icedtea6-plugin',
+    'luakit',
+  ]:
     ensure => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
@@ -85,7 +149,9 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   }
 
   # Lenny only
-  package { [ 'mozilla-firefox-adblock' ]:
+  package { [
+    'mozilla-firefox-adblock',
+  ]:
     ensure => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
-- 
cgit v1.2.3