Adds ensure param to utils classes

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

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

diff --git a/manifests/utils/base.pp b/manifests/utils/base.pp
index 27629491c94625c1722c63ae5231c2d8b95f8597..cd6e1d49342f055c4b9ee9014471c2259aaefbac 100644 (file)
--- a/manifests/utils/base.pp
+++ b/manifests/utils/base.pp
@@ -1,4 +1,6 @@
-class nodo::utils::base {
+class nodo::utils::base (
+  $ensure = 'installed',
+) {
   package { [
     'screen',
     'less',
@@ -22,7 +24,7 @@ class nodo::utils::base {
     'bash-completion',
     'zsh',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Not using right now

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

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

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

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

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

diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 05ce69c201d61907834467b9fc975fff11ed289a..2c67e539d0054576226d6a9c55a8b88145b789c2 100644 (file)
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -1,4 +1,6 @@
-class nodo::utils::development::debian {
+class nodo::utils::development::debian (
+  $ensure = 'installed',
+) {
   package { [
     'debhelper',
     'python-stdeb',
@@ -27,6 +29,6 @@ class nodo::utils::development::debian {
     'apt-listchanges',
     'apt-forktracer',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index e96c5479547ec19c3225ab34a0da05494f0a5888..e37ab444eba7b1ebdafd6004f395a417a802c557 100644 (file)
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,4 +1,6 @@
-class nodo::utils::development::git {
+class nodo::utils::development::git (
+  $ensure = 'installed',
+) {
   package { [
     'tig',
     'git-extras',
@@ -11,7 +13,7 @@ class nodo::utils::development::git {
     #'git-gui',
     #'git-stuff',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Newer packages

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index 2e89273c7b9157fa979c0277637c3eda8b740a00..96d92e1254b228a77cdc60c520e0518cfde60a27 100644 (file)
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,4 +1,6 @@
-class nodo::utils::development::ide {
+class nodo::utils::development::ide (
+  $ensure = 'installed',
+) {
   # In use
   package { [
     'mr',
@@ -18,6 +20,6 @@ class nodo::utils::development::ide {
     #'doxygen',
     #'agave',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index e5aac1bca9380634754e4888325d6115fa553268..ab1be9273c094810bcd61bdf51cea8f2a42dc997 100644 (file)
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,8 +1,10 @@
-class nodo::utils::development::puppet {
+class nodo::utils::development::puppet (
+  $ensure = 'installed',
+) {
   package { [
     'puppet-lint',
     'hiera-eyaml',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

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

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

diff --git a/manifests/utils/development/toolchain.pp b/manifests/utils/development/toolchain.pp
index dbea0dfb75ed724b10902a22a148aa4be877f781..8adec0147a5f9079192a0f35e1e4287442a19619 100644 (file)
--- a/manifests/utils/development/toolchain.pp
+++ b/manifests/utils/development/toolchain.pp
@@ -1,4 +1,6 @@
-class nodo::utils::development::toolchain {
+class nodo::utils::development::toolchain (
+  $ensure = 'installed',
+) {
   package { [
     'emdebian-archive-keyring',
     'scratchbox2',
@@ -6,7 +8,7 @@ class nodo::utils::development::toolchain {
     'multistrap',
     'fakechroot',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Old stuff

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

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

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

diff --git a/manifests/utils/doc.pp b/manifests/utils/doc.pp
index 5849d3e2592cf3bf06445e2632c8b26cf396b864..5f7537839ddc3aaa692cdda6cbaabf202c4e8103 100644 (file)
--- a/manifests/utils/doc.pp
+++ b/manifests/utils/doc.pp
@@ -1,8 +1,10 @@
-class nodo::utils::doc {
+class nodo::utils::doc (
+  $ensure = 'installed',
+) {
   package { [
     # apt-get install anarchism!
     'anarchism',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/finance.pp b/manifests/utils/finance.pp
index 63a99115c634ef8d9872ecc7a5783b60ba5f81c6..6e7197c8102c5bf175f51b88e3105c6884f80111 100644 (file)
--- a/manifests/utils/finance.pp
+++ b/manifests/utils/finance.pp
@@ -1,4 +1,6 @@
-class nodo::utils::finance {
+class nodo::utils::finance (
+  $ensure = 'installed',
+) {
   # Finance
   package { [
     'gnucash',
@@ -6,6 +8,6 @@ class nodo::utils::finance {
     'clipf',
     'misery',
   ]:
-    ensure  => present,
+    ensure => $ensure,
   }
 }

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

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

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

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

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

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

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

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

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

diff --git a/manifests/utils/java.pp b/manifests/utils/java.pp
index ec1220f08634f198e687bfd3b33b7a95aa6a2d8d..59e26a3fc2540c91cae722b59f110f0162d91e1f 100644 (file)
--- a/manifests/utils/java.pp
+++ b/manifests/utils/java.pp
@@ -1,4 +1,6 @@
-class nodo::utils::java {
+class nodo::utils::java (
+  $ensure = 'installed',
+) {
   # Java
   package { [
     'sun-java6-jre',
@@ -10,12 +12,15 @@ class nodo::utils::java {
     'default-jre',
     'openjdk-7-jre-headless',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 
   # Java alternative
   file { "/etc/alternatives/java":
-    ensure  => hiera('nodo::utils::java::alternative', '/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java'),
+    ensure  => $ensure ? {
+      'present','installed','latest' => hiera('nodo::utils::java::alternative', '/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java'),
+      default                        => undef,
+    },
     owner   => root,
     group   => root,
     require => Package['default-jre'],

diff --git a/manifests/utils/laptop/thinkpad/battery.pp b/manifests/utils/laptop/thinkpad/battery.pp
index c8fdb5229d6085da030734e462b6024f615551f4..c82112c95273cea3b9e1cc7a44aa8316727ed39b 100644 (file)
--- a/manifests/utils/laptop/thinkpad/battery.pp
+++ b/manifests/utils/laptop/thinkpad/battery.pp
@@ -1,16 +1,17 @@
 # apci-call or tp-smapi available
 class nodo::utils::laptop::thinkpad::battery(
   $implementation = 'acpi-call',
+  $ensure         = 'installed',
 ) {
   package { [
     'tlp',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 
   package { [
     "${implementation}-dkms",
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/latex.pp b/manifests/utils/latex.pp
index 8b297238f7d3a200a4ee7f6811cc9a53f219e50e..74aa72c4b77c2fc19595fdc4eb56064478c19789 100644 (file)
--- a/manifests/utils/latex.pp
+++ b/manifests/utils/latex.pp
@@ -1,4 +1,6 @@
-class nodo::utils::latex {
+class nodo::utils::latex (
+  $ensure = 'installed',
+) {
   # LaTeX
   package { [
     'texlive-latex-base',
@@ -8,6 +10,6 @@ class nodo::utils::latex {
     'vim-latexsuite',
     'pdfjam',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/monkeysphere.pp b/manifests/utils/monkeysphere.pp
index 8da90b976cc8f0ff29f195cacfa716d38e3eb800..d04123e5d024f7e071df1ae8f93424f4934248d0 100644 (file)
--- a/manifests/utils/monkeysphere.pp
+++ b/manifests/utils/monkeysphere.pp
@@ -1,4 +1,6 @@
-class nodo::utils::monkeysphere {
+class nodo::utils::monkeysphere (
+  $ensure = 'installed',
+) {
   # Monkeysphere
   package { [
     'xul-ext-monkeysphere',
@@ -6,6 +8,6 @@ class nodo::utils::monkeysphere {
     'xul-ext-firebug',
     'msva-perl',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

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

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

diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp
index 5283534f4069d4701a59848d6ff63f840dedf091..f6cee10797a4afb30017441475bbf4a11dd09539 100644 (file)
--- a/manifests/utils/multimedia/gnash.pp
+++ b/manifests/utils/multimedia/gnash.pp
@@ -1,4 +1,6 @@
-class nodo::utils::multimedia::gnash {
+class nodo::utils::multimedia::gnash (
+  $ensure = 'installed',
+) {
   package { [
     'flashplugin-nonfree',
   ]:
@@ -8,14 +10,17 @@ class nodo::utils::multimedia::gnash {
   package { [
     'browser-plugin-gnash',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
     owner   => root,
     group   => root,
-    ensure  => "/usr/lib/gnash/libgnashplugin.so",
+    ensure  => $ensure ? {
+      'installed','present' => "/usr/lib/gnash/libgnashplugin.so",
+      default               => undef,
+    },
     require => Package['browser-plugin-gnash'],
   }
 }

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

diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index 3459daa28d7b98054506799883a3529654433b74..fe220f44f3d241e13cab9f89891550e1860344d9 100644 (file)
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::minimal {
+class nodo::utils::multimedia::minimal (
+  $ensure = 'installed',
+) {
   package { [
     'alsa-utils',
     'mpg123',
     'mediainfo',
     'mplayer2',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp
index c97908d50fe59c1be81313838c321623abb9a966..51b431b782f83ad6500924113d22fb243a03f99c 100644 (file)
--- a/manifests/utils/multimedia/ripper.pp
+++ b/manifests/utils/multimedia/ripper.pp
@@ -1,4 +1,6 @@
-class nodo::utils::multimedia::ripper {
+class nodo::utils::multimedia::ripper(
+  $ensure = 'installed',
+) {
   # CD writers and extractors
   package { [
     'ripit',
@@ -11,6 +13,6 @@ class nodo::utils::multimedia::ripper {
     'eject',
     'cdrdao',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index cf3a712cbd1089af42144c1ecae74ec126f64f9c..6ff22edee8a0af234b5695a199adaf681d2db632 100644 (file)
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -1,16 +1,21 @@
-class nodo::utils::multimedia::shockwave {
+class nodo::utils::multimedia::shockwave (
+  $ensure = 'installed',
+) {
   # See also https://github.com/i-rinat/freshplayerplugin
   package { [
     'flashplugin-nonfree',
   ]:
-    ensure => installed ,
+    ensure => $ensure,
   }
 
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
     owner   => root,
     group   => root,
-    ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+    ensure  => $ensure ? {
+      'present','installed' => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+      default               => undef,
+    },
     require => Package['flashplugin-nonfree'],
   }
 }

diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp
index 742cf9c21ae9de6a00a77e510f6fbd4b63404b94..72b42b1a564a70b62589366737df53f417816f47 100644 (file)
--- a/manifests/utils/multimedia/studio.pp
+++ b/manifests/utils/multimedia/studio.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::studio {
+class nodo::utils::multimedia::studio (
+  $ensure = 'installed',
+) {
   package { [
     'ardour',
     'hydrogen',
     'mixxx',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Instruments
@@ -14,7 +16,7 @@ class nodo::utils::multimedia::studio {
     'rakarrack',
     'tuxguitar-jack',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # LADSPA plugins
@@ -24,6 +26,6 @@ class nodo::utils::multimedia::studio {
     'tap-plugins',
     'invada-studio-plugins-ladspa',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index c3f4f41024184cd561047a7586a7ced7a8ff984c..7a308928448b9cc274bab03b934f4557abe57a14 100644 (file)
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -1,4 +1,6 @@
-class nodo::utils::network::analyzer {
+class nodo::utils::network::analyzer (
+  $ensure = 'installed',
+) {
   package { [
     'tshark',
     'arping',
@@ -9,14 +11,14 @@ class nodo::utils::network::analyzer {
     'iperf',
     'zmap',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # https://www.linode.com/docs/networking/diagnosing-network-issues-with-mtr
   package { [
     'mtr',
   ]:
-    ensure  => present,
+    ensure  => $ensure,
   }
 
   # Not in use

diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp
index e6416b3d9d0181fbc05e13af82053cebeefc1ee1..4ffd886b6c892b7c98ce6f1925ba30c2ce28c819 100644 (file)
--- a/manifests/utils/network/irssi.pp
+++ b/manifests/utils/network/irssi.pp
@@ -1,10 +1,12 @@
-class nodo::utils::network::irssi {
+class nodo::utils::network::irssi (
+  $ensure = 'installed',
+) {
   package { [
     'irssi',
     'bitlbee',
     'irssi-scripts',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   package { [
@@ -17,7 +19,7 @@ class nodo::utils::network::irssi {
   package { [
     'irssi-plugin-otr',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # These are needed by the cap_sasl.pl irssi plugin
@@ -26,7 +28,7 @@ class nodo::utils::network::irssi {
     'libcrypt-dh-perl',
     'libcrypt-openssl-bignum-perl',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Not on wheezy

diff --git a/manifests/utils/network/mail.pp b/manifests/utils/network/mail.pp
index 5c2b07f9c9d922b72373c8ea9d7819656f58ccbe..281ced105ccbf4bba0db208d5de49cac187fa0b2 100644 (file)
--- a/manifests/utils/network/mail.pp
+++ b/manifests/utils/network/mail.pp
@@ -1,4 +1,6 @@
-class nodo::utils::network::mail {
+class nodo::utils::network::mail (
+  $ensure = 'installed',
+) {
   # Mail
   package { [
     'mutt',
@@ -11,7 +13,7 @@ class nodo::utils::network::mail {
     'procmail',
     'msmtp',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Fix: ensure that fetchmail is not a service

diff --git a/manifests/utils/network/nfs.pp b/manifests/utils/network/nfs.pp
index 19072fa013cc1f628f24946f31920481ef6f1b57..7bc817cbb3cd17fdadba931ecdb9b2ca6643f54c 100644 (file)
--- a/manifests/utils/network/nfs.pp
+++ b/manifests/utils/network/nfs.pp
@@ -1,7 +1,9 @@
-class nodo::utils::network::nfs {
+class nodo::utils::network::nfs (
+  $ensure = 'installed',
+) {
   package { [
     'nfs-common',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/pppoe.pp b/manifests/utils/network/pppoe.pp
index db4e0855c0bd016cc6584d7b45e22c189ac1f5b9..a9a62f4198d2878df416c610d94496976aa6827c 100644 (file)
--- a/manifests/utils/network/pppoe.pp
+++ b/manifests/utils/network/pppoe.pp
@@ -1,9 +1,11 @@
-class nodo::utils::network::pppoe {
+class nodo::utils::network::pppoe (
+  $ensure = 'installed',
+) {
   package { [
     'ppp',
     'pppoe',
     'pppoeconf',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/pptp.pp b/manifests/utils/network/pptp.pp
index bdd47761ad6657a05566ae30c5e3e8d13fea5d13..8e8db9a7aab5d35face1581500ad025a8c348432 100644 (file)
--- a/manifests/utils/network/pptp.pp
+++ b/manifests/utils/network/pptp.pp
@@ -1,7 +1,9 @@
-class nodo::utils::network::pptp {
+class nodo::utils::network::pptp (
+  $ensure = 'installed',
+) {
   package { [
     'pptp-linux',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/samba.pp b/manifests/utils/network/samba.pp
index ee9fc82bc77bb84c36510978105b8397ecb3297f..e5a3ff5b5399e8ce3567b8e480e373a8b4c2fc36 100644 (file)
--- a/manifests/utils/network/samba.pp
+++ b/manifests/utils/network/samba.pp
@@ -1,9 +1,11 @@
-class nodo::utils::network::samba {
+class nodo::utils::network::samba (
+  $ensure = 'installed',
+) {
   package { [
     'smbclient',
     'cifs-utils',
     'nbtscan',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/snort.pp b/manifests/utils/network/snort.pp
index 8b14413f07b7c29c41e03bba1ff276de156134d3..a94dc8aa5680a5e39d06f9784555a3f626a4a268 100644 (file)
--- a/manifests/utils/network/snort.pp
+++ b/manifests/utils/network/snort.pp
@@ -1,7 +1,9 @@
-class nodo::utils::network::snort {
+class nodo::utils::network::snort (
+  $ensure = 'installed',
+) {
   package { [
     'snort',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/torrent.pp b/manifests/utils/network/torrent.pp
index 027e2b84635cdf3bc6520b0f0b62b35e81d8489d..e6f677168085eb3da4bd31605bf1b14fd7928548 100644 (file)
--- a/manifests/utils/network/torrent.pp
+++ b/manifests/utils/network/torrent.pp
@@ -1,7 +1,9 @@
-class nodo::utils::network::torrent {
+class nodo::utils::network::torrent (
+  $ensure = 'installed',
+) {
   package { [
     'rtorrent',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
index 065d5bb809e41c00c74eae368314507739a0c91f..86af12ad45aa0c33fa3674f3c13281418f75accf 100644 (file)
--- a/manifests/utils/network/wicd.pp
+++ b/manifests/utils/network/wicd.pp
@@ -1,9 +1,11 @@
-class nodo::utils::network::wicd {
+class nodo::utils::network::wicd (
+  $ensure = 'installed',
+) {
   package { [
     'wicd',
     'wicd-curses',
     #'wicd-gtk',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/network/xmpp.pp b/manifests/utils/network/xmpp.pp
index 8b2c49edbb421bc3452a6b620377fc40fdb9a84d..9870338189ef655c3384491410b77f119dce42e3 100644 (file)
--- a/manifests/utils/network/xmpp.pp
+++ b/manifests/utils/network/xmpp.pp
@@ -1,4 +1,6 @@
-class nodo::utils::network::xmpp {
+class nodo::utils::network::xmpp (
+  $ensure = 'installed',
+) {
   package { [
     'pidgin',
     'pidgin-encryption',
@@ -7,6 +9,6 @@ class nodo::utils::network::xmpp {
     'pidgin-privacy-please',
     'pidgin-plugin-pack',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 690bde5fc8cc47e1aba1b177faaa3ea93219c856..eeb6d2e2490b726a39c120533bce38aa41083a40 100644 (file)
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,4 +1,6 @@
-class nodo::utils::office {
+class nodo::utils::office (
+  $ensure = 'installed',
+) {
   # Not in use
   package { [
     'kalarm',

diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp
index a30aaebd1717acf86f6dbbd489371b4ea7d8bf9b..7233d0dcb7a3617df4b15c2d8a26f05e133ff6f9 100644 (file)
--- a/manifests/utils/office/console.pp
+++ b/manifests/utils/office/console.pp
@@ -1,4 +1,6 @@
-class nodo::utils::office::console {
+class nodo::utils::office::console (
+  $ensure = 'installed',
+) {
   package { [
     'vim-gtk',
     'wyrd',
@@ -10,6 +12,6 @@ class nodo::utils::office::console {
     'mat',
     #'worklog',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/office/gui.pp b/manifests/utils/office/gui.pp
index 434dede4235aa4d4dbb3cee34d274391480b4d49..3bb43fe3afe95b7bfa5c57ffd75aeb1332b8750f 100644 (file)
--- a/manifests/utils/office/gui.pp
+++ b/manifests/utils/office/gui.pp
@@ -1,4 +1,6 @@
-class nodo::utils::office::gui {
+class nodo::utils::office::gui (
+  $ensure = 'installed',
+) {
   package { [
     'gobby',
     'libreoffice',
@@ -8,6 +10,6 @@ class nodo::utils::office::gui {
     #'evince',
     #'aewan',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp
index 1ea6b13db1af6f4b5d83e26554cf6ca2d16b205f..89f60643794161deeef2aefbea13a473f4e71041 100644 (file)
--- a/manifests/utils/physical.pp
+++ b/manifests/utils/physical.pp
@@ -1,5 +1,7 @@
 # Common utilities for physical
-class nodo::utils::physical {
+class nodo::utils::physical (
+  $ensure = 'installed',
+) {
   package { [
     'nload',
     'acpid',
@@ -22,7 +24,7 @@ class nodo::utils::physical {
     'powertop',
     'bwm-ng',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   package { [
@@ -32,26 +34,16 @@ class nodo::utils::physical {
       'armv5tel' => absent,
       'armv6l'   => absent,
       'armv7l'   => absent,
-       default   => present,
+       default   => $ensure,
     }
   }
 
-  #
-  # Testers / health check
-  #
-
-  #package { [
-  #  'memtester',
-  #]:
-  #  ensure  => present,
-  #}
-
   package { [
     'memtest86+',
   ]:
     ensure => $::architecture ? {
-      'amd64' => present,
-       default   => absent,
+      'amd64'  => $ensure,
+       default => absent,
     }
   }
 }

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

diff --git a/manifests/utils/printer.pp b/manifests/utils/printer.pp
index 2b1875a63af14fa38e2e7e09f560396ae628a688..3aa7096e0f51443ef51c57f614d61a29bf6033e3 100644 (file)
--- a/manifests/utils/printer.pp
+++ b/manifests/utils/printer.pp
@@ -1,4 +1,6 @@
-class nodo::utils::printer {
+class nodo::utils::printer (
+  $ensure = 'installed',
+) {
   package { [
     'cups-client',
     'hplip',
@@ -6,6 +8,6 @@ class nodo::utils::printer {
     'printer-driver-hpcups',
     'hpijs-ppds',
   ]:
-    ensure  => present,
+    ensure => $ensure,
   }
 }

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

diff --git a/manifests/utils/sdr.pp b/manifests/utils/sdr.pp
index 443e58d74e836defb2bfb1a79def505bd9079154..a5f719bf654a64fed7ea67ee9f4435405de7941d 100644 (file)
--- a/manifests/utils/sdr.pp
+++ b/manifests/utils/sdr.pp
@@ -1,5 +1,5 @@
 class nodo::utils::sdr(
-  $ensure = 'present',
+  $ensure = 'installed',
 ) {
   package { [
     'rtl-srd',

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

diff --git a/manifests/utils/security/base.pp b/manifests/utils/security/base.pp
index b639e8c16a3a592dadb2d8c404f8d040a78cdb71..9eef9910602aefc58e4a43b489fe34fcb7c978e4 100644 (file)
--- a/manifests/utils/security/base.pp
+++ b/manifests/utils/security/base.pp
@@ -1,9 +1,11 @@
-class nodo::utils::security::base {
+class nodo::utils::security::base (
+  $ensure = 'installed',
+) {
   package { [
     'keychain',
     'gnupg-curl',
     #'hopenpgp-tools',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/security/bitmask.pp b/manifests/utils/security/bitmask.pp
index 13dea90a6a45c24991ed1cb6b0ab2b4a82d963a6..025418a3ca89d052b5d0b8d3172902e266829e8a 100644 (file)
--- a/manifests/utils/security/bitmask.pp
+++ b/manifests/utils/security/bitmask.pp
@@ -1,15 +1,17 @@
-class nodo::utils::security::bitmask {
+class nodo::utils::security::bitmask (
+  $ensure = 'installed',
+) {
   # You need to manually add https://dl.bitmask.net/apt.key into apt keyring
   ::apt::sources_list { 'bitmask.net.list':
     content => "deb http://deb.bitmask.net/debian wheezy main\n",
-    ensure  => present,
+    ensure  => $ensure,
   }
 
   package { [
     'bitmask',
     'leap-keyring',
   ]:
-    ensure  => present,
+    ensure  => $ensure,
     require => Apt::Sources_list['bitmask.net.list'],
   }
 }

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

diff --git a/manifests/utils/security/grsec.pp b/manifests/utils/security/grsec.pp
index c9780889e5d6d5db48fcae1b3fb2eeffea3b02c2..fc6362179dee18dc47eabc8555f5bcc2a975e97c 100644 (file)
--- a/manifests/utils/security/grsec.pp
+++ b/manifests/utils/security/grsec.pp
@@ -1,4 +1,6 @@
-class nodo::utils::security::grsec {
+class nodo::utils::security::grsec (
+  $ensure = 'installed',
+) {
   package { [
     # The package with the specific image version might not be used
     # but right now apt is complaining of unmet dependencies when
@@ -8,6 +10,6 @@ class nodo::utils::security::grsec {
     'linux-image-grsec-amd64',
     'paxtest',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/security/stego.pp b/manifests/utils/security/stego.pp
index 795c243524e8ddcfeb704cd80bbd5eae3ed590e6..b5fc27d6a109f56396884253d397aeb07e571065 100644 (file)
--- a/manifests/utils/security/stego.pp
+++ b/manifests/utils/security/stego.pp
@@ -1,4 +1,6 @@
-class nodo::utils::security::stego {
+class nodo::utils::security::stego (
+  $ensure = 'installed',
+) {
   package { [
     'snow',
     'stegsnow',
@@ -6,6 +8,6 @@ class nodo::utils::security::stego {
     'snowdrop',
     'python-stepic',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }

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

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

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

diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp
index 4082fe2c5e6a076e0363c0bb5e2fdbc111521675..0c3f5ccecb4d3181441ba03d4cfedaea11834e42 100644 (file)
--- a/manifests/utils/storage/archive.pp
+++ b/manifests/utils/storage/archive.pp
@@ -1,8 +1,11 @@
-class nodo::utils::storage::archive {
+class nodo::utils::storage::archive (
+  $ensure = 'installed',
+) {
   package { [
     'git-annex',
   ]:
-    ensure => latest,
+    #ensure => latest,
+    ensure => $ensure,
   }
 
   # Not in use
@@ -18,8 +21,8 @@ class nodo::utils::storage::archive {
     'syslinux-utils',
   ]:
     ensure => $::architecture ? {
-      'amd64' => present,
-      'i386'  => present,
+      'amd64' => $ensure,
+      'i386'  => $ensure,
       default => absent,
     },
   }

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

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

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

diff --git a/manifests/utils/suckless.pp b/manifests/utils/suckless.pp
index b17dc34816d783fa655e8a359b49ea8f3b05d4ad..9bc0e86fd655825c1ce3e38e7daa64f8b1b9aabe 100644 (file)
--- a/manifests/utils/suckless.pp
+++ b/manifests/utils/suckless.pp
@@ -1,4 +1,6 @@
-class nodo::utils::suckless {
+class nodo::utils::suckless (
+  $ensure = 'installed',
+) {
   package { [
     'dwm',
     'mupdf',
@@ -10,6 +12,6 @@ class nodo::utils::suckless {
     'xxxterm',
     'stterm',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/thinkpad.pp b/manifests/utils/thinkpad.pp
index ae251780a07cb046fce7739ec40a7d44f11f6b41..a712048b9318917944257fe5a537abb87dd12cbb 100644 (file)
--- a/manifests/utils/thinkpad.pp
+++ b/manifests/utils/thinkpad.pp
@@ -1,9 +1,11 @@
-class nodo::utils::thinkpad {
+class nodo::utils::thinkpad (
+  $ensure = 'installed',
+) {
   # Keyboard
   package { [
     'tpb',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Thinkfan
@@ -17,6 +19,6 @@ class nodo::utils::thinkpad {
   package { [
     'hdapsd',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

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

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

diff --git a/manifests/utils/virtual.pp b/manifests/utils/virtual.pp
index 3678997ef1f815e7ee8119ffc21e83bc0c364cc6..b521d38b02e0e477b86d11fdd6355ec9359a2d9e 100644 (file)
--- a/manifests/utils/virtual.pp
+++ b/manifests/utils/virtual.pp
@@ -1,4 +1,6 @@
-class nodo::utils::virtual {
+class nodo::utils::virtual (
+  $ensure = 'installed',
+) {
   package { [
     # For running virtual machines
     'qemu',
@@ -10,7 +12,7 @@ class nodo::utils::virtual {
     'spice-client',
     'spice-client-gtk',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 
   # We're not managing this package as we're favouring the
@@ -18,6 +20,6 @@ class nodo::utils::virtual {
   #package { [
   #  'virtualbox-fuse',
   #]:
-  #  ensure  => present,
+  #  ensure => $ensure,
   #}
 }

diff --git a/manifests/utils/web/console.pp b/manifests/utils/web/console.pp
index 112a97b87e5631c118f04436e9132bbb4d609f91..07d1473120cccbc756c54f819e639b5cb6e63541 100644 (file)
--- a/manifests/utils/web/console.pp
+++ b/manifests/utils/web/console.pp
@@ -1,4 +1,6 @@
-class nodo::utils::web::console {
+class nodo::utils::web::console (
+  $ensure = 'installed',
+) {
   package { [
     'links',
     'elinks',
@@ -6,6 +8,6 @@ class nodo::utils::web::console {
     'w3m',
     'newsbeuter',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }

diff --git a/manifests/utils/web/gui.pp b/manifests/utils/web/gui.pp
index bbf9e61eacc85cb4e4253d37e0dac5406237db9b..64b4ef6a8a29579e43547417a4c4919b1d84284f 100644 (file)
--- a/manifests/utils/web/gui.pp
+++ b/manifests/utils/web/gui.pp
@@ -1,4 +1,6 @@
-class nodo::utils::web::gui {
+class nodo::utils::web::gui (
+  $ensure = 'installed',
+) {
   # Web: GUI
   package { [
     'firefox-esr',
@@ -23,12 +25,15 @@ class nodo::utils::web::gui {
     #'nicotine',
     #'sshfs',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Browser alternative
   file { "/etc/alternatives/x-www-browser":
-    ensure  => "/usr/bin/firefox-esr",
+    ensure  => $ensure ? {
+      'present','installed' => "/usr/bin/firefox-esr",
+      default               => undef,
+    },
     owner   => root,
     group   => root,
     require => Package['firefox-esr'],
@@ -36,7 +41,10 @@ class nodo::utils::web::gui {
 
   # Browser alternative: manpage
   file { "/etc/alternatives/x-www-browser.1.gz":
-    ensure  => "/usr/share/man/man1/firefox-esr.1.gz",
+    ensure  => $ensure ? {
+      'present','installed' => "/usr/share/man/man1/firefox-esr.1.gz",
+      default               => undef,
+    },
     owner   => root,
     group   => root,
     require => Package['firefox-esr'],