diff options
| -rw-r--r-- | manifests/role/nas.pp | 5 | ||||
| -rw-r--r-- | manifests/utils/office.pp | 1 | ||||
| -rw-r--r-- | manifests/utils/personal/bundle.pp | 1 | ||||
| -rw-r--r-- | manifests/utils/printer.pp | 5 |
4 files changed, 7 insertions, 5 deletions
diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp index a0a4c3d..08b0ac7 100644 --- 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 d4638b0..f28204c 100644 --- 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 67ef542..695bfa4 100644 --- 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 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, + } +} |