Coding style for utilities

10 files changed, 74 insertions, 18 deletions

diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 2bcb97c..670ffcb 100644
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -1,9 +1,19 @@
 class nodo::utils::network::analyzer {
-  package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf' ]:
+  package { [
+    'tshark',
+    'arping',
+    'fping',
+    'oping',
+    'tcptraceroute',
+    'tcpstat',
+    'iperf',
+  ]:
     ensure => installed,
   }
 
-  package { 'zmap':
+  package { [
+    'zmap',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'squeeze' => absent,
       default   => present,
@@ -11,12 +21,17 @@ class nodo::utils::network::analyzer {
   }
 
   # https://www.linode.com/docs/networking/diagnosing-network-issues-with-mtr
-  package { 'mtr':
+  package { [
+    'mtr',
+  ]:
     ensure  => present,
   }
 
   # Not in use
-  package { [ 'heartbleeder', 'psad' ]:
+  package { [
+    'heartbleeder',
+    'psad',
+  ]:
     ensure => absent,
   }
 }
diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp
index e0a94b5..ac2b59a 100644
--- a/manifests/utils/network/irssi.pp
+++ b/manifests/utils/network/irssi.pp
@@ -1,23 +1,38 @@
 class nodo::utils::network::irssi {
-  package { [ 'irssi', 'bitlbee', 'irssi-scripts' ]:
+  package { [
+    'irssi',
+    'bitlbee',
+    'irssi-scripts',
+  ]:
     ensure => installed,
   }
 
-  package { [ 'ttytter', 'libterm-readkey-perl' ]:
+  package { [
+    'ttytter',
+    'libterm-readkey-perl',
+  ]:
     ensure => present,
   }
 
-  package { 'irssi-plugin-otr':
+  package { [
+    'irssi-plugin-otr',
+  ]:
     ensure => installed,
   }
 
   # These are needed by the cap_sasl.pl irssi plugin
-  package { [ 'libcrypt-blowfish-perl', 'libcrypt-dh-perl', 'libcrypt-openssl-bignum-perl' ]:
+  package { [
+    'libcrypt-blowfish-perl',
+    'libcrypt-dh-perl',
+    'libcrypt-openssl-bignum-perl',
+  ]:
     ensure => installed,
   }
 
   # Not on wheezy
-  package { 'irssi-plugin-silc':
+  package { [
+    'irssi-plugin-silc',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
       'jessie' => absent,
diff --git a/manifests/utils/network/minimal.pp b/manifests/utils/network/minimal.pp
index 8c0145b..940c90c 100644
--- a/manifests/utils/network/minimal.pp
+++ b/manifests/utils/network/minimal.pp
@@ -2,13 +2,19 @@ class nodo::utils::network::minimal inherits nodo::utils::http {
   include nodo::utils::network::irssi
   include nodo::utils::network::torrent
 
-  package { [ 'unison', 'httrack', 'zsync' ]:
+  package { [
+    'unison',
+    'httrack',
+    'zsync',
+  ]:
     ensure => installed,
   }
 
   # For backwards compatibility
   # See addversionno unison config parameter
-  package { 'unison2.32.52':
+  package { [
+    'unison2.32.52',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,
diff --git a/manifests/utils/network/nfs.pp b/manifests/utils/network/nfs.pp
index 9abe38e..19072fa 100644
--- a/manifests/utils/network/nfs.pp
+++ b/manifests/utils/network/nfs.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::nfs {
-  package { 'nfs-common':
+  package { [
+    'nfs-common',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/pppoe.pp b/manifests/utils/network/pppoe.pp
index 9d9223c..db4e085 100644
--- a/manifests/utils/network/pppoe.pp
+++ b/manifests/utils/network/pppoe.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::pppoe {
-  package { [ 'ppp', 'pppoe', 'pppoeconf' ]:
+  package { [
+    'ppp',
+    'pppoe',
+    'pppoeconf',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/network/pptp.pp b/manifests/utils/network/pptp.pp
index 1a9a25d..bdd4776 100644
--- a/manifests/utils/network/pptp.pp
+++ b/manifests/utils/network/pptp.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::pptp {
-  package { 'pptp-linux':
+  package { [
+    'pptp-linux',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/samba.pp b/manifests/utils/network/samba.pp
index 7e19ed3..ee9fc82 100644
--- a/manifests/utils/network/samba.pp
+++ b/manifests/utils/network/samba.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::samba {
-  package { [ 'smbclient', 'cifs-utils', 'nbtscan' ]:
+  package { [
+    'smbclient',
+    'cifs-utils',
+    'nbtscan',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/snort.pp b/manifests/utils/network/snort.pp
index 0908c58..8b14413 100644
--- a/manifests/utils/network/snort.pp
+++ b/manifests/utils/network/snort.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::snort {
-  package { 'snort':
+  package { [
+    'snort',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/network/torrent.pp b/manifests/utils/network/torrent.pp
index 154b24c..027e2b8 100644
--- a/manifests/utils/network/torrent.pp
+++ b/manifests/utils/network/torrent.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::torrent {
-  package { [ 'rtorrent' ]:
+  package { [
+    'rtorrent',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
index cb19af3..898e043 100644
--- a/manifests/utils/network/wicd.pp
+++ b/manifests/utils/network/wicd.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::wicd {
-  package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
+  package { [
+    'wicd',
+    'wicd-curses',
+    'wicd-gtk',
+  ]:
     ensure => installed,
   }
 }