Adds nodo::utils::printer

diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp
index a0a4c3deaa8b4818d70ceb0b6cc548048edf7b81..08b0ac7dd848588159f2e22279ad643e736a75b4 100644 (file)
--- a/manifests/role/nas.pp
+++ b/manifests/role/nas.pp
@@ -294,10 +294,7 @@ class nodo::role::nas(
 
   if $cups == true {
     include firewall::printer
-
-    package { [ 'cups', 'cups-client', 'cups-bsd', 'hplip' ]:
-      ensure => installed,
-    }
+    include nodo::utils::printer
   }
 
   #

diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index d4638b0b8e93a86097868548c1a796848b3c0e39..f28204c771811fd0b293a436b0b163bf381aba5f 100644 (file)
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -3,7 +3,6 @@ class nodo::utils::office {
   package { [ 'vim-gtk',             'gobby',
               'sc',                  'antiword',            'dia',
               'kalarm',              'pandoc',              'gnumeric',
-              'cups-client',         'hplip',               'cups-bsd',
               'gnucash',             'worklog',             'pdftk',
               'calibre',             'fbreader',            'gobby-0.5',
               'mat',                 'evince',              'jekyll',

diff --git a/manifests/utils/personal/bundle.pp b/manifests/utils/personal/bundle.pp
index 67ef542adff0361e53b8aac95e02deb0c3fca7e2..695bfa4e7dfe57c68a425821a80b394e2bd49f97 100644 (file)
--- a/manifests/utils/personal/bundle.pp
+++ b/manifests/utils/personal/bundle.pp
@@ -1,6 +1,7 @@
 class nodo::utils::personal::bundle {
   include nodo::utils::suckless
   include nodo::utils::office
+  include nodo::utils::printer
   include nodo::utils::interface
   include nodo::utils::network
   include nodo::utils::development

diff --git a/manifests/utils/printer.pp b/manifests/utils/printer.pp
new file mode 100644 (file)
index 0000000..25226b7
--- /dev/null
+++ b/manifests/utils/printer.pp
@@ -0,0 +1,5 @@
+class nodo::utils::printer {
+  package { [ 'cups-client', 'hplip', 'cups-bsd', 'printer-driver-hpcups', 'hpijs-ppds' ]:
+    ensure  => present,
+  }
+}