Coding style for utilities

diff --git a/manifests/utils/android.pp b/manifests/utils/android.pp
index 8cb56c876f3ca056b5cde551204f7d310da8603f..700f0ae4ce7e24644fe0cfbbba9b485d55cbea81 100644 (file)
--- a/manifests/utils/android.pp
+++ b/manifests/utils/android.pp
@@ -1,5 +1,9 @@
 class nodo::utils::android {
-  package { [ 'android-tools-adb', 'android-tools-fastboot', 'android-tools-fsutils' ]:
+  package { [
+    'android-tools-adb',
+    'android-tools-fastboot',
+    'android-tools-fsutils',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/arduino.pp b/manifests/utils/arduino.pp
index 627f86ad8a560bfaa6a780f73e30e8ea163ac924..bf83f51a7852d15e3a4e3eca524ac9a6d282bf15 100644 (file)
--- a/manifests/utils/arduino.pp
+++ b/manifests/utils/arduino.pp
@@ -1,7 +1,11 @@
 class nodo::utils::arduino(
   $ensure = 'present',
 ) {
-  package { [ 'avrdude', 'arduino', 'arduino-mk' ]:
+  package { [
+    'avrdude',
+    'arduino',
+    'arduino-mk',
+  ]:
     ensure => $ensure,
   }
 }

diff --git a/manifests/utils/astronomy.pp b/manifests/utils/astronomy.pp
index 946aaa5bd3cc3a46af48e046963374977da7e1e1..a41ffe671b8d5bf352a41ff9d031012fc7b5ae7a 100644 (file)
--- a/manifests/utils/astronomy.pp
+++ b/manifests/utils/astronomy.pp
@@ -1,5 +1,7 @@
 class nodo::utils::astronomy {
-  package { 'stellarium':
+  package { [
+    'stellarium',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/base.pp b/manifests/utils/base.pp
index f7ff201b0cae5a2e9dd982e26342cf380dd0cfb0..b17e5743c4309389937ddf7d6ac6ab1ba14b519e 100644 (file)
--- a/manifests/utils/base.pp
+++ b/manifests/utils/base.pp
@@ -1,13 +1,38 @@
 class nodo::utils::base {
-  package { [ 'screen',    'less',   'bzip2', 'openssl', 'lynx',         'unzip',
-              'nmap',      'telnet', 'tree',  'whois',   'dosfstools',   'dnsutils',     'secure-delete',
-              'bc',        'lsof',   'wipe',  'vrms',    'nsca-client',  'uuid-runtime',
-              'multitail', 'bash-completion', 'zsh' ]:
+  package { [
+    'screen',
+    'less',
+    'bzip2',
+    'openssl',
+    'lynx',
+    'unzip',
+    'nmap',
+    'telnet',
+    'tree',
+    'whois',
+    'dosfstools',
+    'dnsutils',
+    'secure-delete',
+    'bc',
+    'lsof',
+    'wipe',
+    'vrms',
+    'nsca-client',
+    'uuid-runtime',
+    'multitail',
+    'bash-completion',
+    'zsh',
+  ]:
     ensure => installed,
   }
 
   # Not using right now
-  package { [ 'logcheck', 'logcheck-database', 'denyhosts', 'logwatch' ]:
+  package { [
+    'logcheck',
+    'logcheck-database',
+    'denyhosts',
+    'logwatch',
+  ]:
     ensure => absent,
   }
 }

diff --git a/manifests/utils/bitcoin.pp b/manifests/utils/bitcoin.pp
index c287bbc3b0356fab6853bea26905c396c628d450..6a63300970057a7da534f037487f768159eb026c 100644 (file)
--- a/manifests/utils/bitcoin.pp
+++ b/manifests/utils/bitcoin.pp
@@ -1,10 +1,14 @@
 class nodo::utils::bitcoin {
-  package { 'electrum':
+  package { [
+    'electrum',
+  ]:
     ensure  => present,
   }
 
   # To be considered
-  #package { 'armory':
+  #package { [
+  #  'armory',
+  #]:
   #  ensure  => present,
   #}
 }

diff --git a/manifests/utils/browser/hardened.pp b/manifests/utils/browser/hardened.pp
index e641a7171bde13b52d715dcf142a08aed6ad2a8a..47133e1222b3d8ccf12b0cfe61fdecc33a577ff1 100644 (file)
--- a/manifests/utils/browser/hardened.pp
+++ b/manifests/utils/browser/hardened.pp
@@ -1,9 +1,9 @@
 class nodo::utils::browser::hardened {
   package { [ 
-              'torbrowser-launcher',
-              'xul-ext-requestpolicy',
-              'xul-ext-certificatepatrol',
-            ]:
+    'torbrowser-launcher',
+    'xul-ext-requestpolicy',
+    'xul-ext-certificatepatrol',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/desktop.pp b/manifests/utils/desktop.pp
index 9001b592d783b8bdc38e5424210d92a593bb1344..0c134783dea745ad0a0a2f28621012446865a78e 100644 (file)
--- a/manifests/utils/desktop.pp
+++ b/manifests/utils/desktop.pp
@@ -1,6 +1,8 @@
 # Common utilities for desktop
 class nodo::utils::desktop {
-  package { 'cups':
+  package { [
+    'cups',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/desktop/cinnamon.pp b/manifests/utils/desktop/cinnamon.pp
index eefcec6effa4326a22c7311a272dbecd9adf8ca9..613c647b0071820b35571ddf402d7eaa061a4d7d 100644 (file)
--- a/manifests/utils/desktop/cinnamon.pp
+++ b/manifests/utils/desktop/cinnamon.pp
@@ -1,5 +1,7 @@
 class nodo::utils::desktop::cinnamon {
-  package { 'cinnamon':
+  package { [
+    'cinnamon',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index 3542f3454c4d3440ab32a3b45585a98b442b54dc..935555d1156c200af21bb9c18f1c925260f8922f 100644 (file)
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -1,5 +1,8 @@
 class nodo::utils::desktop::gnome {
-  package { [ 'gnome', 'gnome-backgrounds' ]:
+  package { [
+    'gnome',
+    'gnome-backgrounds',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/desktop/vnc.pp b/manifests/utils/desktop/vnc.pp
index 86280ffd9e77f8e2c4188f783e8f56eb8419b78b..6f8bb99a37ca5d61eeeb6f3e29cbbc42a3ddbdb2 100644 (file)
--- a/manifests/utils/desktop/vnc.pp
+++ b/manifests/utils/desktop/vnc.pp
@@ -1,5 +1,7 @@
 class nodo::utils::desktop::vnc {
-  package { 'tightvncserver':
+  package { [
+    'tightvncserver',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 7b0e97f640e61ea210f1a0de725bc5b265e5f9f8..ef2cba20f6ca8d5c8ee51be0b5613b2295e5a04e 100644 (file)
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -1,9 +1,33 @@
 class nodo::utils::development::debian {
-  package { [ 'debhelper',       'python-stdeb',    'fakeroot',     'dupload',        'autotools-dev',   'dh-make',
-              'reportbug',       'debian-keyring',  'devscripts',   'pbuilder',       'build-essential', 'dh-buildinfo',
-              'quilt',           'dpatch',          'dput',         'debian-goodies', 'gem2deb',         'git-buildpackage',
-              'cdbs',            'dh-autoreconf',   'apt-rdepends', 'po4a',           'vmdebootstrap',   'apt-show-versions',
-              'apt-show-source', 'apt-listchanges', 'apt-forktracer' ]:
+  package { [
+    'debhelper',
+    'python-stdeb',
+    'fakeroot',
+    'dupload',
+    'autotools-dev',
+    'dh-make',
+    'reportbug',
+    'debian-keyring',
+    'devscripts',
+    'pbuilder',
+    'build-essential',
+    'dh-buildinfo',
+    'quilt',
+    'dpatch',
+    'dput',
+    'debian-goodies',
+    'gem2deb',
+    'git-buildpackage',
+    'cdbs',
+    'dh-autoreconf',
+    'apt-rdepends',
+    'po4a',
+    'vmdebootstrap',
+    'apt-show-versions',
+    'apt-show-source',
+    'apt-listchanges',
+    'apt-forktracer',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/development/gis.pp b/manifests/utils/development/gis.pp
index 8855166585f6737dcf0283e09844b0537056c45e..1a3c412a6e96249bc95b606c02cdebd1f62a70d6 100644 (file)
--- a/manifests/utils/development/gis.pp
+++ b/manifests/utils/development/gis.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::gis {
-  package { 'qgis':
+  package { [
+    'qgis'
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index b5fc5aa66eef23a54ff84ab1adafb7d01b44cde0..7052d963b47a9b3b68aad374b462b0d4ba47b4f0 100644 (file)
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,11 +1,22 @@
 class nodo::utils::development::git {
-  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'legit',
-              'git-extras', 'git-flow', 'topgit', 'git-remote-gcrypt', ]:
+  package { [
+    'gitk',
+    'git-gui',
+    'tig',
+    'git-cola',
+    'legit',
+    'git-extras',
+    'git-flow',
+    'topgit',
+    'git-remote-gcrypt',
+  ]:
     ensure => installed,
   }
 
   # Newer packages
-  package { 'git-crypt':
+  package { [
+    'git-crypt',
+  ]:
     ensure => $::lsbdistcodename ? {
       'stretch' => present,
       'sid'     => present,
@@ -14,7 +25,9 @@ class nodo::utils::development::git {
   }
 
   # Wheezy only
-  package { 'git-stuff':
+  package { [
+    'git-stuff',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index c1cdc52fa101afd89604d8a57aabf60d54c30f55..9928da5208640983888698bcde9bcb5a2e9e4362 100644 (file)
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,29 +1,29 @@
 class nodo::utils::development::ide {
   # In use
   package { [
-              'mr',
-              'hexedit',
-              'ack-grep',
-              'markdown',
-              'python-sphinx',
-              'pelican',
-            ]:
+    'mr',
+    'hexedit',
+    'ack-grep',
+    'markdown',
+    'python-sphinx',
+    'pelican',
+  ]:
     ensure => installed,
   }
 
   # Not in use
   package { [
-              'ttyrec',
-              'bugs-everywhere',
-              'silversearcher-ag',
-              'ticgit',
-              'ticgitweb',
-              'ditz',
-              'pnopaste-cli',
-              'exuberant-ctags',
-              'doxygen',
-              'agave',
-            ]:
+    'ttyrec',
+    'bugs-everywhere',
+    'silversearcher-ag',
+    'ticgit',
+    'ticgitweb',
+    'ditz',
+    'pnopaste-cli',
+    'exuberant-ctags',
+    'doxygen',
+    'agave',
+  ]:
     ensure => absent,
   }
 }

diff --git a/manifests/utils/development/mediawiki.pp b/manifests/utils/development/mediawiki.pp
index 5ba5b5589f431f1cd49ae0c31395f7a07cac1c9a..a92b8d58a225f904ad537309efa5242233880b2f 100644 (file)
--- a/manifests/utils/development/mediawiki.pp
+++ b/manifests/utils/development/mediawiki.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::mediawiki {
-  package { 'git-mediawiki':
+  package { [
+    'git-mediawiki',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,

diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index bf26dbbb0494875e318d8749f4dd03cd8e3adc66..0d823a753dfc649a1ecc9a95038eeef308de97c4 100644 (file)
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,9 +1,13 @@
 class nodo::utils::development::puppet {
-  package { 'puppet-lint':
+  package { [
+    'puppet-lint',
+  ]:
     ensure => installed,
   }
 
-  package { 'ruby-hiera-puppet':
+  package { [
+    'ruby-hiera-puppet',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,

diff --git a/manifests/utils/development/python.pp b/manifests/utils/development/python.pp
index 6e3852508ed7798d0e761f1b86616222386ac8cc..036c0ce1c8036abdfdd23f01bf5bf1b752740338 100644 (file)
--- a/manifests/utils/development/python.pp
+++ b/manifests/utils/development/python.pp
@@ -1,5 +1,11 @@
 class nodo::utils::development::python {
-  package { [ 'python-setuptools', 'python-virtualenv', 'python-yaml', 'python-cheetah', 'python-unidecode' ]:
+  package { [
+    'python-setuptools',
+    'python-virtualenv',
+    'python-yaml',
+    'python-cheetah',
+    'python-unidecode',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/development/reverse.pp b/manifests/utils/development/reverse.pp
index 1770b34ae407166628b821017e81f9ea07e71676..72cf480ed588759acd8bf36cbb5a75443f23939f 100644 (file)
--- a/manifests/utils/development/reverse.pp
+++ b/manifests/utils/development/reverse.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::reverse {
-  package { 'binwalk':
+  package { [
+    'binwalk',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index e654e38854f8c47cc892c5e6adffacbdeee82dfe..9e48a31d620a0c3876a9872a16262fe2e5453aad 100644 (file)
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,9 +1,17 @@
 class nodo::utils::development::system {
-  package { [ 'debirf', 'xorriso', 'kpartx', 'openocd', 'live-build' ]:
+  package { [
+    'debirf',
+    'xorriso',
+    'kpartx',
+    'openocd',
+    'live-build',
+  ]:
     ensure => installed,
   }
 
-  package { 'unetbootin':
+  package { [
+    'unetbootin',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,

diff --git a/manifests/utils/development/toolchain.pp b/manifests/utils/development/toolchain.pp
index 9abc130904f4dd772637eb419b1030aa2e3de166..ca392993d2e7f8b51fe358c248dcecd604b474b2 100644 (file)
--- a/manifests/utils/development/toolchain.pp
+++ b/manifests/utils/development/toolchain.pp
@@ -1,6 +1,13 @@
 class nodo::utils::development::toolchain {
-  package { [ 'emdebian-archive-keyring', 'xapt',       'pdebuild-cross', 'scratchbox2',
-              'qemu-user-static',         'multistrap', 'fakechroot' ]:
+  package { [
+    'emdebian-archive-keyring',
+    'xapt',
+    'pdebuild-cross',
+    'scratchbox2',
+    'qemu-user-static',
+    'multistrap',
+    'fakechroot',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/development/toolchain/arm.pp b/manifests/utils/development/toolchain/arm.pp
index 911f5cb13e87b03ca397bdcee6d64b1bef301936..6f4334cb966b6a1be5d9174e99f5b9ed17c01e4f 100644 (file)
--- a/manifests/utils/development/toolchain/arm.pp
+++ b/manifests/utils/development/toolchain/arm.pp
@@ -15,9 +15,15 @@ class nodo::utils::development::toolchain::arm(
   #  },
   #}
 
-  package { [ 'linux-libc-dev-armel-cross', 'libc6-armel-cross',         'libc6-dev-armel-cross',
-              'binutils-arm-linux-gnueabi', 'gcc-4.4-arm-linux-gnueabi', 'g++-4.4-arm-linux-gnueabi',
-              'gdb-arm-linux-gnueabi' ]:
+  package { [
+    'linux-libc-dev-armel-cross',
+    'libc6-armel-cross',
+    'libc6-dev-armel-cross',
+    'binutils-arm-linux-gnueabi',
+    'gcc-4.4-arm-linux-gnueabi',
+    'g++-4.4-arm-linux-gnueabi',
+    'gdb-arm-linux-gnueabi',
+  ]:
     ensure  => $ensure,
     require => Apt::Sources_list['emdebian.list'],
   }

diff --git a/manifests/utils/development/vcs.pp b/manifests/utils/development/vcs.pp
index 2787d9845ade2085c85b464cbe38a21d25a28059..ce24148194a69a71cbd54e7a6d7223f9187e7396 100644 (file)
--- a/manifests/utils/development/vcs.pp
+++ b/manifests/utils/development/vcs.pp
@@ -1,5 +1,9 @@
 class nodo::utils::development::vcs {
-  package { [ 'subversion', 'mercurial', 'bzr']:
+  package { [
+    'subversion',
+    'mercurial',
+    'bzr',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 2258554234c8553932a67018df17b09ec944c3e7..dcdc9d48844ae4e091cd7fe9e55b28895d97d67e 100644 (file)
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -1,28 +1,40 @@
 class nodo::utils::development::virtual {
-  package { 'vagrant':
+  package { [
+    'vagrant',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
        default  => latest,
     }
   }
 
-  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
+  package { [
+    'virtualbox-guest-additions-iso',
+    'qemu',
+    'qemu-kvm',
+  ]:
     ensure => latest,
   }
 
   # TODO: wait for jessie release
-  #package { 'docker.io':
+  #package { [
+  #  'docker.io',
+  #]:
   #  ensure => installed,
   #}
 
   # TODO: wait for stretch release
-  #package { 'packer':
+  #package { [
+  #  'packer',
+  #]:
   #  ensure => installed,
   #}
 
   # TODO: We're not managing this package as we're favouring the
   #       wheezy-backports virtualbox which doesn't needs it.
-  #package { 'virtualbox-fuse':
+  #package { [
+  #  'virtualbox-fuse',
+  #]:
   #  ensure  => present,
   #}
 }

diff --git a/manifests/utils/development/web.pp b/manifests/utils/development/web.pp
index 1a7effeb31d2bdac7de70fc2542153bb098d1576..911c63402cfb91afcf13f4f683f7fdfcec6b0546 100644 (file)
--- a/manifests/utils/development/web.pp
+++ b/manifests/utils/development/web.pp
@@ -1,5 +1,8 @@
 class nodo::utils::development::web {
-  package { [ 'apache2-utils', 'yui-compressor' ]:
+  package { [
+    'apache2-utils',
+    'yui-compressor',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/dns.pp b/manifests/utils/dns.pp
index 57bb9926d258de3802ac82a2074758a06d66657f..01a472e225af167de9865643fd783ddac89d6785 100644 (file)
--- a/manifests/utils/dns.pp
+++ b/manifests/utils/dns.pp
@@ -1,5 +1,7 @@
 class nodo::utils::dns {
-  package { 'dnstop':
+  package { [
+    'dnstop',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/firmware.pp b/manifests/utils/firmware.pp
index ccdae37904cb8ae910e69a06da7ed77746224ce8..1be0540225b0e9e59dae912491f483c1bd68d777 100644 (file)
--- a/manifests/utils/firmware.pp
+++ b/manifests/utils/firmware.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware {
-  package { 'firmware-linux':
+  package { [
+    'firmware-linux',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/firmware/iwlwifi.pp b/manifests/utils/firmware/iwlwifi.pp
index 0dd761a22125fb5916615906c56b50ec6d4a1408..4bca68dbf80893cdddab0e02200f4c2d4642658a 100644 (file)
--- a/manifests/utils/firmware/iwlwifi.pp
+++ b/manifests/utils/firmware/iwlwifi.pp
@@ -1,6 +1,8 @@
 # Wireless support
 class nodo::utils::firmware::iwlwifi {
-  package { 'firmware-iwlwifi':
+  package { [
+    'firmware-iwlwifi',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/firmware/ralink.pp b/manifests/utils/firmware/ralink.pp
index 8c60eae2d61020fea4d6062f1f2f680d86cbc2aa..f22bd4ce206a9ab6618da429e3c224484fc1c689 100644 (file)
--- a/manifests/utils/firmware/ralink.pp
+++ b/manifests/utils/firmware/ralink.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware::ralink {
-  package { 'firmware-ralink':
+  package { [
+    'firmware-ralink',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/firmware/realtek.pp b/manifests/utils/firmware/realtek.pp
index 77d916ace4ae4b00f10d09a286c150de7e325fc4..b310c2805be5bb02825acdd98984fc6403d17ce9 100644 (file)
--- a/manifests/utils/firmware/realtek.pp
+++ b/manifests/utils/firmware/realtek.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware::realtek {
-  package { 'firmware-realtek':
+  package { [
+    'firmware-realtek',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/firmware/tools.pp b/manifests/utils/firmware/tools.pp
index 413a59393ed2d0fc9ab3a5bb35873b5bd9b0d2c4..288bd54a501db8d5380c5737d48a0226ab21b337 100644 (file)
--- a/manifests/utils/firmware/tools.pp
+++ b/manifests/utils/firmware/tools.pp
@@ -1,5 +1,9 @@
 class nodo::utils::firmware::tools {
-  package { [ 'flashrom', 'nvramtool', 'nvram-wakeup' ]:
+  package { [
+    'flashrom',
+    'nvramtool',
+    'nvram-wakeup',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/grub.pp b/manifests/utils/grub.pp
index 1d244581c09db9ea0b0d4564c2ed93276a7b245b..3dfe8eadde287add1cb6dab42c6d7750a62aebf6 100644 (file)
--- a/manifests/utils/grub.pp
+++ b/manifests/utils/grub.pp
@@ -1,5 +1,7 @@
 class nodo::utils::grub {
-  package { 'grub2':
+  package { [
+    'grub2',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/hamradio.pp b/manifests/utils/hamradio.pp
index 69156505f06c84789ab1be9ec5dd6725c870cf3e..8b72a32a2bada7a18e2fcfef07a452fc676e2053 100644 (file)
--- a/manifests/utils/hamradio.pp
+++ b/manifests/utils/hamradio.pp
@@ -1,5 +1,7 @@
 class nodo::utils::hamradio {
-  package { 'aldo':
+  package { [
+    'aldo',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/http.pp b/manifests/utils/http.pp
index b2cc26a3dad18ab76289da98007fe59967160245..3a39ff57f2f19172bb352c6836eecfe945f3e6fe 100644 (file)
--- a/manifests/utils/http.pp
+++ b/manifests/utils/http.pp
@@ -1,5 +1,7 @@
 class nodo::utils::http {
-  package { [ 'curl' ]:
+  package { [
+    'curl',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index d5035c243b4ba0a6b7aa576aa44f4dd3590076ee..4367627bf962aa7f884754e9dda9058cc4f3d0d3 100644 (file)
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -1,19 +1,47 @@
 class nodo::utils::interface inherits nodo::utils::interface::console {
   # Interface
-  package { [ 'awesome',          'eterm',             'weather-util', 'gnome-terminal', 'conky',
-              'xterm',            'xscreensaver',      'thunar',       'x11-apps',       'conky-all',
-              'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt',         'lxappearance',   'xdotool',
-              'xtitle',           'xclip',             'pcmanfm',      'awesome-extra',  'numlockx',
-              'metar',            'wmctrl',            'xsel',         'xinput',         'i3' ]:
+  package { [
+    'awesome',
+    'eterm',
+    'weather-util',
+    'gnome-terminal',
+    'conky',
+    'xterm',
+    'xscreensaver',
+    'thunar',
+    'x11-apps',
+    'conky-all',
+    'gtk-theme-switch',
+    'gtk-smooth-themes',
+    'rxvt',
+    'lxappearance',
+    'xdotool',
+    'xtitle',
+    'xclip',
+    'pcmanfm',
+    'awesome-extra',
+    'numlockx',
+    'metar',
+    'wmctrl',
+    'xsel',
+    'xinput',
+    'i3',
+  ]:
     ensure => installed,
   }
 
   # Fonts
-  package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'fonts-inconsolata' ]:
+  package { [
+    'xfonts-terminus',
+    'ttf-bitstream-vera',
+    'fonts-inconsolata',
+  ]:
     ensure => installed,
   }
 
-  package { 'rxvt-unicode':
+  package { [
+    'rxvt-unicode',
+  ]:
     ensure => present,
     # We need a workaround for this:
     # https://bbs.archlinux.org/viewtopic.php?id=50647
@@ -24,7 +52,9 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
     }
   }
 
-  package { "terminology":
+  package { [
+    'terminology',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,
@@ -32,12 +62,17 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
   }
 
   # Old stuff
-  package { [ 'conkyforecast', 'fluxbox' ]:
+  package { [
+    'conkyforecast',
+    'fluxbox',
+  ]:
     ensure => absent,
   }
 
   # To be considered
-  #package { 'needrestart-session':
+  #package { 
+  #  'needrestart-session',
+  #]:
   #  ensure  => present,
   #}
 }

diff --git a/manifests/utils/interface/console.pp b/manifests/utils/interface/console.pp
index 7aea43be822edb24a10e51cd2cada9ec8a8b9b94..545195209a7ec0479d54ffdd8be018d4ff4dae2d 100644 (file)
--- a/manifests/utils/interface/console.pp
+++ b/manifests/utils/interface/console.pp
@@ -1,5 +1,12 @@
 class nodo::utils::interface::console {
-  package { [ 'mc', 'tmux', 'moreutils', 'powerline', 'fonts-powerline', 'ranger' ]:
+  package { [
+    'mc',
+    'tmux',
+    'moreutils',
+    'powerline',
+    'fonts-powerline',
+    'ranger',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/java.pp b/manifests/utils/java.pp
index bb86593dd1d11603584ac2763dab3f3a19e6c825..ec1220f08634f198e687bfd3b33b7a95aa6a2d8d 100644 (file)
--- a/manifests/utils/java.pp
+++ b/manifests/utils/java.pp
@@ -1,10 +1,15 @@
 class nodo::utils::java {
   # Java
-  package { [ 'sun-java6-jre' ]:
+  package { [
+    'sun-java6-jre',
+  ]:
     ensure => absent,
   }
 
-  package { [ 'default-jre', 'openjdk-7-jre-headless' ]:
+  package { [
+    'default-jre',
+    'openjdk-7-jre-headless',
+  ]:
     ensure => present,
   }
 

diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp
index 5f5c0c7e152692f0661b53f349c551229007ed7d..d45ec4cbca0c2eadcedfd196c76708cdc66fdb21 100644 (file)
--- a/manifests/utils/laptop/debian.pp
+++ b/manifests/utils/laptop/debian.pp
@@ -2,15 +2,50 @@
 class nodo::utils::laptop::debian {
   include nodo::utils::storage::layer
 
-  package { [ 'cpufrequtils',  'module-assistant',  'wireless-tools',
-              'wpasupplicant', 'ekiga',             'mumble',
-              'arp-scan',      'usb-modeswitch',
-              'iw',            'wvdial',            'wavemon',
-              'btscanner',     'laptop-mode-tools', 'acpi-support',
-              'tftp',          'sharutils',         'wireshark',
-              'weplab',        'wpagui',
-              'gnokii',        'sslstrip',          'uswsusp',
-              'tcpdump',       'tshark' ]:
+  # Power management
+  package { [
+    'cpufrequtils',
+    'acpi-support',
+    'laptop-mode-tools',
+  ]:
     ensure => installed,
   }
+
+  # Wireless
+  package { [
+    'wireless-tools',
+    'wpasupplicant',
+  ]:
+    ensure => installed,
+  }
+
+  # Network layer
+  #package { [
+  #  'arp-scan',
+  #  'wavemon',
+  #  'wvdial',
+  #  'iw',
+  #  'btscanner',
+  #  'weplab',
+  #  'wireshark',
+  #  'tftp',
+  #  'tcpdump',
+  #  'tshark',
+  #  'wpagui',
+  #  'sslstrip',
+  #]:
+  #  ensure => installed,
+  #}
+
+  # Misc
+  #package { [
+  #  'module-assistant', 
+  #  'ekiga',
+  #  'mumble',
+  #  'usb-modeswitch',
+  #  'gnokii',
+  #  'sharutils', 
+  #]:
+  #  ensure => installed,
+  #}
 }

diff --git a/manifests/utils/laptop/thinkpad/battery.pp b/manifests/utils/laptop/thinkpad/battery.pp
index 9073f048fd0059e07587ac04b699c3d4b56e8a60..c8fdb5229d6085da030734e462b6024f615551f4 100644 (file)
--- a/manifests/utils/laptop/thinkpad/battery.pp
+++ b/manifests/utils/laptop/thinkpad/battery.pp
@@ -2,11 +2,15 @@
 class nodo::utils::laptop::thinkpad::battery(
   $implementation = 'acpi-call',
 ) {
-  package { 'tlp':
+  package { [
+    'tlp',
+  ]:
     ensure => present,
   }
 
-  package { "${implementation}-dkms":
+  package { [
+    "${implementation}-dkms",
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/microcode/intel.pp b/manifests/utils/microcode/intel.pp
index b4d12bcaf39f484c2ee88e2b73469753711cd3d1..7e9c56503b5affd3566e5c5ce9265fcc2016542f 100644 (file)
--- a/manifests/utils/microcode/intel.pp
+++ b/manifests/utils/microcode/intel.pp
@@ -2,7 +2,9 @@ class nodo::utils::microcode::intel {
   # Microcode
   # See https://wiki.archlinux.org/index.php/Microcode
   #     http://en.gentoo-wiki.com/wiki/Intel_Microcode
-  package { 'intel-microcode':
+  package { [
+    'intel-microcode',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 829cd3be7e27c36fd62bbd7d0c6e76002dfd48ce..c99a896bf2105d8be8068b4beae2f6c88610b58f 100644 (file)
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -1,25 +1,56 @@
 # Multimedia utilities
 class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   # Multimedia
-  package { [ 'alsa-tools-gui',  'mp3blaster',          'netpbm',
-              'audacious',       'qjackctl',
-              'gimp',            'xine-ui',             'v4l-utils',          'inkscape',
-              'easytag',         'gstreamer-tools',     'vlc',                'audacity',
-              'opencubicplayer', 'libasound2-plugins',  'lame',               'geeqie',
-              'cbrpager',        'llgal',               'darksnow',           'pavucontrol',
-              'picard',          'ffmpeg2theora',       'oggfwd',             'jhead',
-              'gxine',           'totem',               'faad',               'gmtp',
-              'gphotofs',        'jmtpfs' ]:
+  package { [
+    'alsa-tools-gui',
+    'mp3blaster',
+    'netpbm',
+    'audacious',
+    'qjackctl',
+    'gimp',
+    'xine-ui',
+    'v4l-utils',
+    'inkscape',
+    'easytag',
+    'gstreamer-tools',
+    'vlc',
+    'audacity',
+    'opencubicplayer',
+    'libasound2-plugins',
+    'lame',
+    'geeqie',
+    'cbrpager',
+    'llgal',
+    'darksnow',
+    'pavucontrol',
+    'picard',
+    'ffmpeg2theora',
+    'oggfwd',
+    'jhead',
+    'gxine',
+    'totem',
+    'faad',
+    'gmtp',
+    'gphotofs',
+    'jmtpfs',
+  ]:
     ensure => installed,
   }
 
   # Old stuff
-  package { [ 'amarok', 'moc', 'cmus' ]:
+  package { [
+    'amarok',
+    'moc',
+    'cmus',
+  ]:
     ensure => purged,
   }
 
   # Squeeze only
-  package { [ 'tucan', 'orpheus' ]:
+  package { [
+    'tucan',
+    'orpheus',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => installed,
       default   => purged,
@@ -27,7 +58,11 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   }
 
   # Wheezy only
-  package { [ 'landell', 'gqview', 'mencoder' ]:
+  package { [
+    'landell',
+    'gqview',
+    'mencoder',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
       'wheezy'  => installed,

diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp
index b006441dc7bcceb2e86084e2e61db312539e6dc4..05e88ad0f896c0dd1df433ec321b120fb53f59f1 100644 (file)
--- a/manifests/utils/multimedia/cdplayer.pp
+++ b/manifests/utils/multimedia/cdplayer.pp
@@ -1,6 +1,10 @@
 class nodo::utils::multimedia::cdplayer {
   # CD writers and extractors
-  package { [ 'mcdp', 'cdtool', 'cd-discid' ]:
+  package { [
+    'mcdp',
+    'cdtool',
+    'cd-discid',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/multimedia/downloaders.pp b/manifests/utils/multimedia/downloaders.pp
index 26e761c650d8ad57d786ff01051c745a83e4f8f4..40d610f3ae37a2e7dec38bb3233f68e56b5b2827 100644 (file)
--- a/manifests/utils/multimedia/downloaders.pp
+++ b/manifests/utils/multimedia/downloaders.pp
@@ -1,6 +1,8 @@
 class nodo::utils::multimedia::downloaders {
   # Jessie onwards
-  package { 'youtube-dl':
+  package { [
+    'youtube-dl',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,

diff --git a/manifests/utils/multimedia/extractors.pp b/manifests/utils/multimedia/extractors.pp
index 19d3332dde1b3d91e3f391618497e6508fcc2425..a3fde3ce18cd267597bf784ce026e35dadc46d56 100644 (file)
--- a/manifests/utils/multimedia/extractors.pp
+++ b/manifests/utils/multimedia/extractors.pp
@@ -1,5 +1,9 @@
 class nodo::utils::multimedia::extractors {
-  package { [ 'rar', 'unrar', 'zip' ]:
+  package { [
+    'rar',
+    'unrar',
+    'zip',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp
index 3cd564fb3d15ae9cc90899a9994ca83cf91b6be1..5283534f4069d4701a59848d6ff63f840dedf091 100644 (file)
--- a/manifests/utils/multimedia/gnash.pp
+++ b/manifests/utils/multimedia/gnash.pp
@@ -1,9 +1,13 @@
 class nodo::utils::multimedia::gnash {
-  package { 'flashplugin-nonfree':
+  package { [
+    'flashplugin-nonfree',
+  ]:
     ensure => purged,
   }
 
-  package { 'browser-plugin-gnash':
+  package { [
+    'browser-plugin-gnash',
+  ]:
     ensure => present,
   }
 

diff --git a/manifests/utils/multimedia/mediacenter.pp b/manifests/utils/multimedia/mediacenter.pp
index 362e4f312f22ab492dfa015153b08cfe9af241a7..d3388b2d31bcbca62c3b3d4af21cf29cb49b5289 100644 (file)
--- a/manifests/utils/multimedia/mediacenter.pp
+++ b/manifests/utils/multimedia/mediacenter.pp
@@ -1,5 +1,10 @@
 class nodo::utils::multimedia::mediacenter {
-  package { [ 'xbmc', 'upnp-inspector', 'gupnp-tools', 'djmount' ]:
+  package { [
+    'xbmc',
+    'upnp-inspector',
+    'gupnp-tools',
+    'djmount',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index 04709ed542efa00f37619f09899e028f48ba4836..d7795249550bbfad6e8bd926b66c446bf74c1055 100644 (file)
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -1,9 +1,15 @@
 class nodo::utils::multimedia::minimal {
-  package { [ 'alsa-utils', 'mpg123', 'mediainfo' ]:
+  package { [
+    'alsa-utils',
+    'mpg123',
+    'mediainfo',
+  ]:
     ensure => installed,
   }
 
-  package { 'mplayer':
+  package { [
+    'mplayer',
+  ]:
     ensure  => present,
     name    => $::lsbdistcodename ? {
       'wheezy' => 'mplayer',

diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp
index 9fcd12f332c58cb4f855b8ff8e8e0e612b032ede..c97908d50fe59c1be81313838c321623abb9a966 100644 (file)
--- a/manifests/utils/multimedia/ripper.pp
+++ b/manifests/utils/multimedia/ripper.pp
@@ -1,6 +1,16 @@
 class nodo::utils::multimedia::ripper {
   # CD writers and extractors
-  package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject', 'cdrdao' ]:
+  package { [
+    'ripit',
+    'asunder',
+    'wodim',
+    'genisoimage',
+    'dvd+rw-tools',
+    'cdrskin',
+    'cd5',
+    'eject',
+    'cdrdao',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp
index 5b5302aefebf34b3c7926a06905f260f64bdbb4f..abe8b641fe3f72d2b1586e68a63ce7662caffbfc 100644 (file)
--- a/manifests/utils/multimedia/scanner.pp
+++ b/manifests/utils/multimedia/scanner.pp
@@ -1,5 +1,7 @@
 class nodo::utils::multimedia::scanner {
-  package { 'xsane':
+  package { [
+    'xsane',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index a0d644d6959be5b462e19121b4bd19625332472e..cf3a712cbd1089af42144c1ecae74ec126f64f9c 100644 (file)
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -1,6 +1,8 @@
 class nodo::utils::multimedia::shockwave {
   # See also https://github.com/i-rinat/freshplayerplugin
-  package { 'flashplugin-nonfree':
+  package { [
+    'flashplugin-nonfree',
+  ]:
     ensure => installed ,
   }
 

diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp
index 8aadf22723eaa5572b131cd66c9701f5f8ad3d85..742cf9c21ae9de6a00a77e510f6fbd4b63404b94 100644 (file)
--- a/manifests/utils/multimedia/studio.pp
+++ b/manifests/utils/multimedia/studio.pp
@@ -1,15 +1,29 @@
 class nodo::utils::multimedia::studio {
-  package { [ 'ardour', 'hydrogen', 'mixxx' ]:
+  package { [
+    'ardour',
+    'hydrogen',
+    'mixxx',
+  ]:
     ensure => installed,
   }
 
   # Instruments
-  package { [ 'amsynth', 'guitarix', 'rakarrack', 'tuxguitar-jack' ]:
+  package { [
+    'amsynth',
+    'guitarix',
+    'rakarrack',
+    'tuxguitar-jack',
+  ]:
     ensure => installed,
   }
 
   # LADSPA plugins
-  package { [ 'fil-plugins', 'swh-plugins', 'tap-plugins', 'invada-studio-plugins-ladspa' ]:
+  package { [
+    'fil-plugins',
+    'swh-plugins',
+    'tap-plugins',
+    'invada-studio-plugins-ladspa',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 1d9d876945e31d39dcd42ae5214061ed4086fb2f..ac14727c6e0e5663025e83928b0265e0424a9864 100644 (file)
--- 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,

diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 2bcb97ca2d96315cba5b4684997ff1d7d209fdec..670ffcb7688aba113b8055b63e619ed32acea57e 100644 (file)
--- 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 e0a94b5c857c9fcf2f75d1c02b9c54b21c4bc95e..ac2b59ab60c926a8b50a40a955365b5b33c3f10d 100644 (file)
--- 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 8c0145b6848513e775a7d0ced7a7184795f43938..940c90c7c531a8404ad70552b498523afff4c134 100644 (file)
--- 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 9abe38e4bacf16c19946f69a0ead189518df7e9c..19072fa013cc1f628f24946f31920481ef6f1b57 100644 (file)
--- 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 9d9223c85e2665e52cb093062c2e1349392d586a..db4e0855c0bd016cc6584d7b45e22c189ac1f5b9 100644 (file)
--- 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 1a9a25d73b6e29e98af0f3bc9c6e6f13bb14e51f..bdd47761ad6657a05566ae30c5e3e8d13fea5d13 100644 (file)
--- 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 7e19ed37adec7c6d7fa7f24f506449d14eea423e..ee9fc82bc77bb84c36510978105b8397ecb3297f 100644 (file)
--- 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 0908c5827527d9e949f459ae331df09b57b45b3b..8b14413f07b7c29c41e03bba1ff276de156134d3 100644 (file)
--- 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 154b24c0c880b672d37829a62ea1a759fc2277c7..027e2b84635cdf3bc6520b0f0b62b35e81d8489d 100644 (file)
--- 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 cb19af3f709353c415adefb9b40caf2a452acc51..898e043fe939fab8ca10ab9bbcfeab05b0170b55 100644 (file)
--- 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,
   }
 }

diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 6c2b5a703c0e0361e9ca8020da576f488408ff0d..978efe8551032774066cdfaa01c869c49d8d1294 100644 (file)
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,28 +1,60 @@
 class nodo::utils::office {
   # Office
-  package { [ 'vim-gtk',             'gobby',      'libreoffice',
-              'sc',                  'antiword',   'unrtf',
-              'pandoc',              'wyrd',
-              'gnucash',             'worklog',    'pdftk',
-              'fbreader',            'pdfgrep',
-              'mat',                 'evince',
-              'aewan',               'autocutsel',
-              'parcellite' ]:
+  package { [
+    'vim-gtk',
+    'gobby',
+    'libreoffice',
+    'sc',
+    'antiword',
+    'unrtf',
+    'pandoc',
+    'wyrd',
+    'gnucash',
+    'worklog',
+    'pdftk',
+    'fbreader',
+    'pdfgrep',
+    'mat',
+    'evince',
+    'aewan',
+    'autocutsel',
+    'parcellite',
+  ]:
     ensure => installed,
   }
 
   # Finance
-  package { [ 'ledger', 'clipf', 'misery' ]:
+  package { [
+    'ledger',
+    'clipf',
+    'misery',
+  ]:
     ensure  => present,
   }
 
   # LaTeX
-  package { [ 'texlive-latex-base',  'texlive-latex-recommended', 'texlive-latex-extra', 'texlive-fonts-extra', 'vim-latexsuite', 'pdfjam' ]:
+  package { [
+    'texlive-latex-base',
+    'texlive-latex-recommended',
+    'texlive-latex-extra',
+    'texlive-fonts-extra',
+    'vim-latexsuite',
+    'pdfjam',
+  ]:
     ensure => present,
   }
 
   # Not in use
-  package { [ 'kalarm', 'gnumeric', 'jekyll', 'taskwarrior', 'vit', 'hledger', 'dia', 'calibre' ]:
+  package { [
+    'kalarm',
+    'gnumeric',
+    'jekyll',
+    'taskwarrior',
+    'vit',
+    'hledger',
+    'dia',
+    'calibre',
+  ]:
     ensure  => absent,
   }
 }

diff --git a/manifests/utils/office/hp.pp b/manifests/utils/office/hp.pp
index 0ca7241f5f03bd4f6aa88cf9db89e52181c7046e..193eb466ffbbc9ca80db6b120eaf9ab693c3f934 100644 (file)
--- a/manifests/utils/office/hp.pp
+++ b/manifests/utils/office/hp.pp
@@ -1,5 +1,7 @@
 class nodo::utils::office::hp {
-  package { 'hplip-gui':
+  package { [
+    'hplip-gui',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/personal/debian.pp
index 74e2edad9e79ef6878a3f866a7183ef4a98cbca0..ea8550a4a70b5a34353d0f5b3ec4773fd2410dd1 100644 (file)
--- a/manifests/utils/personal/debian.pp
+++ b/manifests/utils/personal/debian.pp
@@ -6,28 +6,50 @@ class nodo::utils::personal::debian {
   include nodo::utils::storage::crypto
 
   # System
-  package { [ 'libpam-mount',  'gawk',
-              'laptop-detect', 'mtp-tools' ]:
+  package { [
+    'libpam-mount',
+    'gawk',
+    'laptop-detect',
+    'mtp-tools',
+  ]:
     ensure => installed,
   }
 
   # Misc
-  package { [ 'fortunes-br', 'recode', 'p7zip-full', 'funcoeszz', 'detox' ]:
+  package { [
+    'fortunes-br',
+    'recode',
+    'p7zip-full',
+    'funcoeszz',
+    'detox',
+  ]:
     ensure => installed,
   }
 
   # Console window managers
-  #package { [ 'screenie', 'iselect', 'byobu' ]:
+  #package { [
+  #  'screenie',
+  #  'iselect',
+  #  'byobu',
+  # ]:
   #  ensure => installed,
   #}
 
   # Console interfaces
-  #package { [ 'gpm', 'fbterm', 'fbiterm' ]:
+  #package { [
+  #  'gpm',
+  #  'fbterm',
+  #  'fbiterm',
+  #]:
   #  ensure => installed,
   #}
 
   # Non-free, old, buggy or absent in newer releases
-  package { [ 'mtpfs', 'unrar', 'figlet' ]:
+  package { [
+    'mtpfs',
+    'unrar',
+    'figlet',
+  ]:
     ensure => purged,
   }
 }

diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp
index acadaca33374c8e5a195249176bfa24924d36484..1ea6b13db1af6f4b5d83e26554cf6ca2d16b205f 100644 (file)
--- a/manifests/utils/physical.pp
+++ b/manifests/utils/physical.pp
@@ -1,13 +1,33 @@
 # Common utilities for physical
 class nodo::utils::physical {
-  package { [ 'nload',    'acpid',     'slurm',  'ethtool', 'parted',  'iftop',
-              'iptraf',   'htop',      'sdparm', 'iotop',   'sysstat', 'saidar',
-              'lshw',     'sg3-utils', 'nmon',   'atop',    'dcfldd',  'gdisk',
-              'powertop', 'bwm-ng' ]:
+  package { [
+    'nload',
+    'acpid',
+    'slurm',
+    'ethtool',
+    'parted',
+    'iftop',
+    'iptraf',
+    'htop',
+    'sdparm',
+    'iotop',
+    'sysstat',
+    'saidar',
+    'lshw',
+    'sg3-utils',
+    'nmon',
+    'atop',
+    'dcfldd',
+    'gdisk',
+    'powertop',
+    'bwm-ng',
+  ]:
     ensure => installed,
   }
 
-  package { 'acpi':
+  package { [
+    'acpi',
+  ]:
     ensure => $::architecture ? {
       'armv5tel' => absent,
       'armv6l'   => absent,
@@ -20,11 +40,15 @@ class nodo::utils::physical {
   # Testers / health check
   #
 
-  #package { 'memtester':
+  #package { [
+  #  'memtester',
+  #]:
   #  ensure  => present,
   #}
 
-  package { 'memtest86+':
+  package { [
+    'memtest86+',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
        default   => absent,

diff --git a/manifests/utils/plug.pp b/manifests/utils/plug.pp
index fe28b55697560ee67c30f58e5d2f22d09f35e27e..86298f9a5a197a8c2c1c13cd83d4db38abbdd7d7 100644 (file)
--- a/manifests/utils/plug.pp
+++ b/manifests/utils/plug.pp
@@ -1,6 +1,12 @@
 # Common utilities for plug computers
 class nodo::utils::plug {
-  package { [ 'mtd-utils', 'cryptsetup', 'u-boot', 'smartmontools', 'u-boot-tools' ]:
+  package { [
+    'mtd-utils',
+    'cryptsetup',
+    'u-boot',
+    'smartmontools',
+    'u-boot-tools',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/printer.pp b/manifests/utils/printer.pp
index 25226b7bc0c7618881e82253eecee9f3950662e4..2b1875a63af14fa38e2e7e09f560396ae628a688 100644 (file)
--- a/manifests/utils/printer.pp
+++ b/manifests/utils/printer.pp
@@ -1,5 +1,11 @@
 class nodo::utils::printer {
-  package { [ 'cups-client', 'hplip', 'cups-bsd', 'printer-driver-hpcups', 'hpijs-ppds' ]:
+  package { [
+    'cups-client',
+    'hplip',
+    'cups-bsd',
+    'printer-driver-hpcups',
+    'hpijs-ppds',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/raspberrypi.pp b/manifests/utils/raspberrypi.pp
index bd24c2023038921f3c2a352f71c1e8968f13d97c..7b5fac4415d6fd968ab4abc241e492c195babf09 100644 (file)
--- a/manifests/utils/raspberrypi.pp
+++ b/manifests/utils/raspberrypi.pp
@@ -1,5 +1,7 @@
 class nodo::utils::raspberrypi {
-  package { 'usbutils':
+  package { [
+    'usbutils',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/ruby.pp b/manifests/utils/ruby.pp
deleted file mode 100644 (file)
index 0025b6b..0000000
--- a/manifests/utils/ruby.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-class nodo::utils::ruby {
-  # Gem packages
-  package { 'capistrano':
-    ensure   => absent,
-    provider => $::lsbdistcodename ? {
-      'squeeze' => gem,
-       default  => apt,
-    },
-    require  => Package['rubygems'],
-  }
-
-  # Gem packages
-  package { 'slideshow':
-    ensure   => absent,
-    provider => gem,
-    require  => Package['rubygems'],
-  }
-
-  if !defined(Package['ruby']) {
-    package { 'ruby':
-      ensure => installed,
-    }
-  }
-
-  if !defined(Package['rubygems']) {
-    package { 'rubygems':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['ruby-dev']) {
-    package { 'ruby-dev':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['libgpgme-ruby1.8']) {
-    package { 'libgpgme-ruby1.8':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-}

diff --git a/manifests/utils/sdr.pp b/manifests/utils/sdr.pp
index c3be73a431b82a07973cf862a32fcf0f6ba69c7f..443e58d74e836defb2bfb1a79def505bd9079154 100644 (file)
--- a/manifests/utils/sdr.pp
+++ b/manifests/utils/sdr.pp
@@ -1,7 +1,12 @@
 class nodo::utils::sdr(
   $ensure = 'present',
 ) {
-  package { [ 'rtl-srd', 'airspy', 'gr-osmosdr', 'gnuradio' ]:
+  package { [
+    'rtl-srd',
+    'airspy',
+    'gr-osmosdr',
+    'gnuradio',
+  ]:
     ensure => $ensure,
   }
 }

diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp
index 98f43cda799bb96712d405e8cf6921d7bd2cfe64..953581cb74513a1f8c6c182c4dadc1aad5fc5bd2 100644 (file)
--- a/manifests/utils/security.pp
+++ b/manifests/utils/security.pp
@@ -1,23 +1,46 @@
 class nodo::utils::security inherits nodo::utils::security::base {
   # Security
-  package { [ 'apg',           'gnupg-agent',   'makepasswd', 'pwgen',          'fpm2',    'encfs',
-              'signing-party', 'libnss3-tools', 'ssss',       'libgfshare-bin', 'pass',
-              'revelation',    'onetime',       'gnupg2',     'monkeysign',     'gnutls-bin' ]:
+  package { [
+    'apg',
+    'gnupg-agent',
+    'makepasswd',
+    'pwgen',
+    'fpm2',
+    'encfs',
+    'signing-party',
+    'libnss3-tools',
+    'ssss',
+    'libgfshare-bin',
+    'pass',
+    'revelation',
+    'onetime',
+    'gnupg2',
+    'monkeysign',
+    'gnutls-bin',
+  ]:
     ensure => installed,
   }
 
   # Soon :)
-  #package { 'keyringer':
+  #package { [
+  #  'keyringer',
+  #]:
   #  ensure => present,
   #}
 
   # To be evaluated
-  #package { [ 'harden', 'paperkey' ]:
+  #package { [
+  #  'harden',
+  #  'paperkey',
+  #]:
   #  ensure  => present,
   #}
 
   if $::lsbdistcodename != 'squeeze' {
-    package { [ 'kedpm', 'kedpm-gtk' ]:
+    package { [
+      'kedpm',
+      'kedpm-gtk',
+    ]:
       ensure => installed,
     }
   }

diff --git a/manifests/utils/security/apparmor.pp b/manifests/utils/security/apparmor.pp
index 022218fcd991a533595fef07379acc5556299da3..527ae1251ead6a49009ea4f627b2285ca791a078 100644 (file)
--- a/manifests/utils/security/apparmor.pp
+++ b/manifests/utils/security/apparmor.pp
@@ -1,5 +1,9 @@
 class nodo::utils::security::apparmor {
-  package { [ 'apparmor', 'apparmor-profiles', 'apparmor-utils' ]:
+  package { [
+    'apparmor',
+    'apparmor-profiles',
+    'apparmor-utils',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/security/base.pp b/manifests/utils/security/base.pp
index 22edb0ea25f1dab65c24956550cd6b7d36256627..ab376ea8e69d87f289fd80c030ab5fb579e429dc 100644 (file)
--- a/manifests/utils/security/base.pp
+++ b/manifests/utils/security/base.pp
@@ -1,10 +1,15 @@
 class nodo::utils::security::base {
-  package { [ 'keychain', 'gnupg-curl' ]:
+  package { [
+    'keychain',
+   'gnupg-curl',
+  ]:
     ensure => present,
   }
 
   # TODO: currently just available on jessie onwards
-  #package { 'hopenpgp-tools':
+  #package { [
+  #  'hopenpgp-tools',
+  #]:
   #  ensure => present,
   #}
 }

diff --git a/manifests/utils/security/bitmask.pp b/manifests/utils/security/bitmask.pp
index 2b6d2e023c3f6fea375cbe1a32a3afc0611d952f..13dea90a6a45c24991ed1cb6b0ab2b4a82d963a6 100644 (file)
--- a/manifests/utils/security/bitmask.pp
+++ b/manifests/utils/security/bitmask.pp
@@ -5,7 +5,10 @@ class nodo::utils::security::bitmask {
     ensure  => present,
   }
 
-  package { [ 'bitmask', 'leap-keyring' ]:
+  package { [
+    'bitmask',
+    'leap-keyring',
+  ]:
     ensure  => present,
     require => Apt::Sources_list['bitmask.net.list'],
   }

diff --git a/manifests/utils/security/forensics.pp b/manifests/utils/security/forensics.pp
index f2f8744b0c7cb51b31766e422d647cf8a0ba3f3f..665b1c75ad13dc71134005aceff65dbccf5a9287 100644 (file)
--- a/manifests/utils/security/forensics.pp
+++ b/manifests/utils/security/forensics.pp
@@ -1,6 +1,8 @@
 # See https://qa.debian.org/developer.php?login=forensics-devel%40lists.alioth.debian.org
 class nodo::utils::security::forensics {
-  package { [ 'lime-forensics-dkms' ]:
+  package { [
+    'lime-forensics-dkms',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/security/stego.pp b/manifests/utils/security/stego.pp
index 0ca95923f44e53c5c2f4a81f039e8f96f0719643..795c243524e8ddcfeb704cd80bbd5eae3ed590e6 100644 (file)
--- a/manifests/utils/security/stego.pp
+++ b/manifests/utils/security/stego.pp
@@ -1,5 +1,11 @@
 class nodo::utils::security::stego {
-  package { [ 'snow', 'stegsnow', 'steghide', 'snowdrop', 'python-stepic' ]:
+  package { [
+    'snow',
+    'stegsnow',
+    'steghide',
+    'snowdrop',
+    'python-stepic',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/security/tails.pp b/manifests/utils/security/tails.pp
index 489de6c271bf8b57a92147b976d27d6602a5fea1..dc3746b762d3b4854b7f766759f2d8cfaaefd5b3 100644 (file)
--- a/manifests/utils/security/tails.pp
+++ b/manifests/utils/security/tails.pp
@@ -1,5 +1,7 @@
 class nodo::utils::security::tails {
-  package { "tails-installer":
+  package { [
+    'tails-installer',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/security/tpm.pp b/manifests/utils/security/tpm.pp
index 2cbae85da2f2edb8e4e2132d5b14199bdef0e97a..32d257653b820d1b3d6016285a8d2de5dcff3bd4 100644 (file)
--- a/manifests/utils/security/tpm.pp
+++ b/manifests/utils/security/tpm.pp
@@ -1,5 +1,8 @@
 class nodo::utils::security::tpm {
-  package { [ 'trousers', 'tpm-tools']:
+  package { [
+    'trousers',
+    'tpm-tools',
+  ]:
     ensure  => present,
   }
 }

diff --git a/manifests/utils/storage.pp b/manifests/utils/storage.pp
index d4a40e68781f79287c9f9893e4cc48c99fffdaf3..7a354dbabbd8e57fbe372208d55b218959393b0a 100644 (file)
--- a/manifests/utils/storage.pp
+++ b/manifests/utils/storage.pp
@@ -1,6 +1,8 @@
 # Common utilities for storage
 class nodo::utils::storage {
-  package { 'clamav':
+  package { [
+    'clamav',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp
index e7af7619d5a0092034545ea276fb91da51a82046..cd670dcfb0b63d01bfdc347ab3d9f5f6e450c573 100644 (file)
--- a/manifests/utils/storage/archive.pp
+++ b/manifests/utils/storage/archive.pp
@@ -1,13 +1,21 @@
 class nodo::utils::storage::archive {
-  package { 'git-annex':
+  package { [
+    'git-annex',
+  ]:
     ensure => latest,
   }
 
-  package { [ 'jigdo-file', 'fdupes', 'gddrescue' ]:
+  package { [
+    'jigdo-file',
+    'fdupes',
+    'gddrescue',
+  ]:
     ensure => installed,
   }
 
-  package { 'syslinux-utils':
+  package { [
+    'syslinux-utils',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
       'i386'  => present,

diff --git a/manifests/utils/storage/crypto.pp b/manifests/utils/storage/crypto.pp
index a683ff7f51ad9a8f64f9383df115d96c15cf2338..0a0d52060c127c5b810b6bb65b20ea925b12bdfe 100644 (file)
--- a/manifests/utils/storage/crypto.pp
+++ b/manifests/utils/storage/crypto.pp
@@ -1,5 +1,8 @@
 class nodo::utils::storage::crypto {
-  package { [ 'cryptsetup', 'ecryptfs-utils' ]:
+  package { [
+    'cryptsetup',
+    'ecryptfs-utils',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/storage/iso.pp b/manifests/utils/storage/iso.pp
index 0492a1d8898ee3a79a6498064c79475f8e148cdf..f271dcdb952675a6d74c709483d304de8780f1ef 100644 (file)
--- a/manifests/utils/storage/iso.pp
+++ b/manifests/utils/storage/iso.pp
@@ -1,5 +1,7 @@
 class nodo::utils::storage::iso {
-  package { 'syslinux':
+  package { [
+    'syslinux',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
       'i386'  => present,

diff --git a/manifests/utils/storage/layer.pp b/manifests/utils/storage/layer.pp
index a12b2d2a979518d2901691f74cb76ec17ba91880..79515737dc98fec39b723443bf9f66fa75060544 100644 (file)
--- a/manifests/utils/storage/layer.pp
+++ b/manifests/utils/storage/layer.pp
@@ -1,7 +1,10 @@
 class nodo::utils::storage::layer {
   include nodo::utils::storage::crypto
 
-  package { [ 'mdadm', 'lvm2' ]:
+  package { [
+    'mdadm',
+    'lvm2',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/suckless.pp b/manifests/utils/suckless.pp
index 40453efb841f3964e9d2507bca38b950a9b293e5..dc27fa0e666a23a68d3c60c6658915976df1f7aa 100644 (file)
--- a/manifests/utils/suckless.pp
+++ b/manifests/utils/suckless.pp
@@ -1,5 +1,16 @@
 class nodo::utils::suckless {
-  package { [ 'dwm', 'mupdf', 'mupdf-tools', 'suckless-tools', 'surf', 'xvt', 'uzbl', 'xxxterm', 'zathura', 'stterm' ]:
+  package { [
+    'dwm',
+    'mupdf',
+    'mupdf-tools',
+    'suckless-tools',
+    'surf',
+    'xvt',
+    'uzbl',
+    'xxxterm',
+    'zathura',
+    'stterm',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/thinkpad.pp b/manifests/utils/thinkpad.pp
index d595dbcf6f9f29f1eb0bdb2475ee44e7aba1853c..ae251780a07cb046fce7739ec40a7d44f11f6b41 100644 (file)
--- a/manifests/utils/thinkpad.pp
+++ b/manifests/utils/thinkpad.pp
@@ -1,16 +1,22 @@
 class nodo::utils::thinkpad {
   # Keyboard
-  package { 'tpb':
+  package { [
+    'tpb',
+  ]:
     ensure => installed,
   }
 
   # Thinkfan
-  package { 'thinkfan':
+  package { [
+    'thinkfan',
+  ]:
     ensure => installed
   }
 
   # HDAPS
-  package { 'hdapsd':
+  package { [
+    'hdapsd',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/tor.pp b/manifests/utils/tor.pp
index f9475a38ebb939cc8059b04c6a9429f0aa4753e5..66dc53f673a46b3a242a76054025acbeab32d65b 100644 (file)
--- a/manifests/utils/tor.pp
+++ b/manifests/utils/tor.pp
@@ -1,5 +1,7 @@
 class nodo::utils::tor {
-  package { 'tor-arm':
+  package { [
+    'tor-arm',
+  ]:
     ensure => installed,
   }
 }

diff --git a/manifests/utils/touchpad.pp b/manifests/utils/touchpad.pp
index a5390ddb5ff6bec57edfaa64ee58fd029f565a46..e9683f4028ad55a9736c4a2bcde4189cee34e7cf 100644 (file)
--- a/manifests/utils/touchpad.pp
+++ b/manifests/utils/touchpad.pp
@@ -1,6 +1,8 @@
 class nodo::utils::touchpad {
   # Touchpad
-  package { 'gpointing-device-settings':
+  package { [
+    'gpointing-device-settings',
+  ]:
     ensure => present,
   }
 }

diff --git a/manifests/utils/web.pp b/manifests/utils/web.pp
index e3e0b9f99b7bfcc262cf4f3172e6f4bd0987c330..cbce7d2164d3eaaac2cdcd95c816c36a9c864bcf 100644 (file)
--- a/manifests/utils/web.pp
+++ b/manifests/utils/web.pp
@@ -1,9 +1,19 @@
 # Common utilities for web
 class nodo::utils::web inherits nodo::utils::http {
-  package { [ 'ffmpeg',  'flvtool2',             'rake',
-              'libxml2', 'libxml2-dev',          'libxslt1-dev',        'libmysqlclient-dev',
-              'g++',     'libcurl4-openssl-dev', 'apache2-prefork-dev', 'goaccess',
-              'apachetop' ]:
+  package { [
+    'ffmpeg',
+    'flvtool2',
+    'rake',
+    'libxml2',
+    'libxml2-dev',
+    'libxslt1-dev',
+    'libmysqlclient-dev',
+    'g++',
+    'libcurl4-openssl-dev',
+    'apache2-prefork-dev',
+    'goaccess',
+    'apachetop',
+  ]:
     ensure => installed,
   }
 }