From 5acda3eaeabae9045609539303a8c12c4ce401f1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 25 Apr 2016 12:01:08 +0200 Subject: merge with latest dev version --- core/modules/cups/data/etc/cups/cupsd.conf | 143 +++++++++++++++++++++ .../cups/data/etc/systemd/system/cups.service | 9 ++ .../system/network.target.wants/cups.service | 1 + core/modules/cups/module.build | 24 ++++ core/modules/cups/module.conf | 13 ++ core/modules/cups/module.conf.debian | 10 ++ core/modules/cups/module.conf.fedora | 12 ++ core/modules/cups/module.conf.opensuse | 12 ++ core/modules/cups/module.conf.opensuse.13.2 | 12 ++ core/modules/cups/module.conf.ubuntu | 10 ++ core/modules/cups/module.conf.ubuntu.12 | 16 +++ core/modules/cups/module.conf.ubuntu.13 | 12 ++ core/modules/cups/module.conf.ubuntu.13.10 | 12 ++ core/modules/cups/module.conf.ubuntu.14 | 18 +++ core/modules/cups/module.conf.ubuntu.16 | 18 +++ 15 files changed, 322 insertions(+) create mode 100644 core/modules/cups/data/etc/cups/cupsd.conf create mode 100644 core/modules/cups/data/etc/systemd/system/cups.service create mode 120000 core/modules/cups/data/etc/systemd/system/network.target.wants/cups.service create mode 100644 core/modules/cups/module.build create mode 100644 core/modules/cups/module.conf create mode 100644 core/modules/cups/module.conf.debian create mode 100644 core/modules/cups/module.conf.fedora create mode 100644 core/modules/cups/module.conf.opensuse create mode 100644 core/modules/cups/module.conf.opensuse.13.2 create mode 100644 core/modules/cups/module.conf.ubuntu create mode 100644 core/modules/cups/module.conf.ubuntu.12 create mode 100644 core/modules/cups/module.conf.ubuntu.13 create mode 100644 core/modules/cups/module.conf.ubuntu.13.10 create mode 100644 core/modules/cups/module.conf.ubuntu.14 create mode 100644 core/modules/cups/module.conf.ubuntu.16 (limited to 'core/modules/cups') diff --git a/core/modules/cups/data/etc/cups/cupsd.conf b/core/modules/cups/data/etc/cups/cupsd.conf new file mode 100644 index 00000000..bd3bc179 --- /dev/null +++ b/core/modules/cups/data/etc/cups/cupsd.conf @@ -0,0 +1,143 @@ +# +# +# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a +# complete description of this file. +# + +# Log general information in error_log - change "warn" to "debug" +# for troubleshooting... +LogLevel warn + +# Deactivate CUPS' internal logrotating, as we provide a better one, especially +# LogLevel debug2 gets usable now +MaxLogSize 0 + +# Administrator user group... +SystemGroup lpadmin + + +# Only listen for connections from the local machine. +Listen localhost:631 +Listen /var/run/cups/cups.sock + +# Show shared printers on the local network. +Browsing Off +BrowseOrder allow,deny +BrowseAllow all +BrowseLocalProtocols CUPS dnssd +BrowseAddress @LOCAL + +# Default authentication type, when authentication is required... +DefaultAuthType Basic + +# Web interface setting... +WebInterface Yes + +# Restrict access to the server... + + Order allow,deny + + +# Restrict access to the admin pages... + + Order allow,deny + + +# Restrict access to configuration files... + + AuthType Default + Require user @SYSTEM + Order allow,deny + + +# Set the default printer/job policies... + + # Job/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # Job-related operations must be done by the owner or an administrator... + + Order deny,allow + + + + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# Set the authenticated printer/job policies... + + # Job/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # Job-related operations must be done by the owner or an administrator... + + AuthType Default + Order deny,allow + + + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# +# diff --git a/core/modules/cups/data/etc/systemd/system/cups.service b/core/modules/cups/data/etc/systemd/system/cups.service new file mode 100644 index 00000000..1c1e6305 --- /dev/null +++ b/core/modules/cups/data/etc/systemd/system/cups.service @@ -0,0 +1,9 @@ +[Unit] +Description=Common Unix Printing System +Requires=network.target graphical.target +After=network.target +Before=graphical.target +ConditionFileNotEmpty=/etc/cups/printers.conf + +[Service] +ExecStart=/usr/sbin/cupsd -f diff --git a/core/modules/cups/data/etc/systemd/system/network.target.wants/cups.service b/core/modules/cups/data/etc/systemd/system/network.target.wants/cups.service new file mode 120000 index 00000000..d8578ebb --- /dev/null +++ b/core/modules/cups/data/etc/systemd/system/network.target.wants/cups.service @@ -0,0 +1 @@ +../cups.service \ No newline at end of file diff --git a/core/modules/cups/module.build b/core/modules/cups/module.build new file mode 100644 index 00000000..0128c3e6 --- /dev/null +++ b/core/modules/cups/module.build @@ -0,0 +1,24 @@ +#!/bin/bash + +fetch_source() { + : +} + +build() { + local COPYLIST file + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + + # cups insists on overriding PATH, so we need to fix any scripts + for file in "${MODULE_BUILD_DIR}"/usr/lib/cups/{filter,backend}/*; do + head -n 1 "$file" | grep -q '^#!/' && sed -i '/^#!\//a . \/etc\/environment' "$file" + done +} + +post_copy() { + : +} + diff --git a/core/modules/cups/module.conf b/core/modules/cups/module.conf new file mode 100644 index 00000000..6ec99ac9 --- /dev/null +++ b/core/modules/cups/module.conf @@ -0,0 +1,13 @@ +REQUIRED_BINARIES=" + cupsd + foomatic-rip + gs +" +REQUIRED_DIRECTORIES=" + /usr/lib/cups/ + /usr/share/cups/ + /usr/share/ghostscript/ + /usr/share/ppd/cupsfilters/ + /usr/bin/ +" +REQUIRED_FILES="" diff --git a/core/modules/cups/module.conf.debian b/core/modules/cups/module.conf.debian new file mode 100644 index 00000000..1bb1efad --- /dev/null +++ b/core/modules/cups/module.conf.debian @@ -0,0 +1,10 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups-daemon + ghostscript + foomatic-filters +" +REQUIRED_CONTENT_PACKAGES=" + cups-daemon + ghostscript + foomatic-filters +" diff --git a/core/modules/cups/module.conf.fedora b/core/modules/cups/module.conf.fedora new file mode 100644 index 00000000..6b028b11 --- /dev/null +++ b/core/modules/cups/module.conf.fedora @@ -0,0 +1,12 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-libs + foomatic-filters + ghostscript +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-libs + foomatic-filters + ghostscript +" diff --git a/core/modules/cups/module.conf.opensuse b/core/modules/cups/module.conf.opensuse new file mode 100644 index 00000000..6b028b11 --- /dev/null +++ b/core/modules/cups/module.conf.opensuse @@ -0,0 +1,12 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-libs + foomatic-filters + ghostscript +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-libs + foomatic-filters + ghostscript +" diff --git a/core/modules/cups/module.conf.opensuse.13.2 b/core/modules/cups/module.conf.opensuse.13.2 new file mode 100644 index 00000000..ebe832dd --- /dev/null +++ b/core/modules/cups/module.conf.opensuse.13.2 @@ -0,0 +1,12 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-libs + cups-filters-foomatic-rip + ghostscript +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-libs + cups-filters-foomatic-rip + ghostscript +" diff --git a/core/modules/cups/module.conf.ubuntu b/core/modules/cups/module.conf.ubuntu new file mode 100644 index 00000000..8ca1d1c6 --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu @@ -0,0 +1,10 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + ghostscript-cups + foomatic-filters +" +REQUIRED_CONTENT_PACKAGES=" + cups + ghostscript-cups + foomatic-filters +" diff --git a/core/modules/cups/module.conf.ubuntu.12 b/core/modules/cups/module.conf.ubuntu.12 new file mode 100644 index 00000000..e858e04c --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu.12 @@ -0,0 +1,16 @@ +REQUIRED_INSTALLED_PACKAGES=" + ghostscript + cups + ghostscript-cups + cups-filters + foomatic-filters + libgs9-common +" +REQUIRED_CONTENT_PACKAGES=" + ghostscript + cups + ghostscript-cups + cups-filters + foomatic-filters + libgs9-common +" diff --git a/core/modules/cups/module.conf.ubuntu.13 b/core/modules/cups/module.conf.ubuntu.13 new file mode 100644 index 00000000..53c8d62d --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu.13 @@ -0,0 +1,12 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-daemon + ghostscript-cups + foomatic-filters +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-daemon + ghostscript-cups + foomatic-filters +" diff --git a/core/modules/cups/module.conf.ubuntu.13.10 b/core/modules/cups/module.conf.ubuntu.13.10 new file mode 100644 index 00000000..d3fa3b5d --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu.13.10 @@ -0,0 +1,12 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-daemon + cups-filters + foomatic-filters +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-daemon + cups-filters + foomatic-filters +" diff --git a/core/modules/cups/module.conf.ubuntu.14 b/core/modules/cups/module.conf.ubuntu.14 new file mode 100644 index 00000000..23207e5b --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu.14 @@ -0,0 +1,18 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-daemon + cups-filters + cups-core-drivers + cups-filters-core-drivers + ghostscript + libgs9-common +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-daemon + cups-filters + cups-core-drivers + cups-filters-core-drivers + ghostscript + libgs9-common +" diff --git a/core/modules/cups/module.conf.ubuntu.16 b/core/modules/cups/module.conf.ubuntu.16 new file mode 100644 index 00000000..23207e5b --- /dev/null +++ b/core/modules/cups/module.conf.ubuntu.16 @@ -0,0 +1,18 @@ +REQUIRED_INSTALLED_PACKAGES=" + cups + cups-daemon + cups-filters + cups-core-drivers + cups-filters-core-drivers + ghostscript + libgs9-common +" +REQUIRED_CONTENT_PACKAGES=" + cups + cups-daemon + cups-filters + cups-core-drivers + cups-filters-core-drivers + ghostscript + libgs9-common +" -- cgit v1.2.3-55-g7522