diff --git a/salt/sys-print/clone.sls b/salt/sys-print/clone.sls index 9467186..47d9905 100644 --- a/salt/sys-print/clone.sls +++ b/salt/sys-print/clone.sls @@ -5,4 +5,4 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} {% from 'utils/macros/clone-template.sls' import clone_template -%} -{{ clone_template('debian-minimal', sls_path) }} +{{ clone_template('fedora-minimal', sls_path) }} diff --git a/salt/sys-print/create.sls b/salt/sys-print/create.sls index 3bb4f0b..de09990 100644 --- a/salt/sys-print/create.sls +++ b/salt/sys-print/create.sls @@ -46,6 +46,7 @@ prefs: features: - enable: - servicevm + - service.avahi - service.cups - appmenus-dispvm - disable: @@ -115,6 +116,7 @@ prefs: features: - enable: - servicevm + - service.avahi - service.cups - disable: - service.cups-browsed diff --git a/salt/sys-print/install.sls b/salt/sys-print/install.sls index 961b755..8534b22 100644 --- a/salt/sys-print/install.sls +++ b/salt/sys-print/install.sls @@ -28,15 +28,41 @@ include: - ipp-usb - man-db ## Print - - printer-driver-cups-pdf - system-config-printer ## Scan - ## TODO: simple-scan did not detect my scanner, but detected printer. - simple-scan - - sane - - sane-utils - sane-airscan +{% set pkg = { + 'Arch': { + 'pkg': [ + ], + }, + 'Debian': { + 'pkg': [ + 'printer-driver-cups-pdf', + 'sane', + 'sane-utils', + ], + }, + 'RedHat': { + 'pkg': [ + 'cups-filters-driverless', + 'cups-ipptool', + 'cups-pdf', + 'gutenprint-cups', + 'sane-backends', + ], + }, +}.get(grains.os_family) -%} + +"{{ slsdotpath }}-installed-os-specific": + pkg.installed: + - setopt: "install_weak_deps=False" + - skip_suggestions: True + - setopt: "install_weak_deps=False" + - pkgs: {{ pkg.pkg|sequence|yaml }} + "{{ slsdotpath }}-add-user-to-lpadmin-group": group.present: - name: lpadmin