diff options
author | Roland Hieber <r.hieber@pengutronix.de> | 2017-11-07 17:40:23 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-11-10 19:19:40 +0100 |
commit | 73f9b0fba0dfd7e286782a342c9997b65f25f235 (patch) | |
tree | cae0488cd0c55b8ca305fd03de9cf6c269b1b1be /projectroot | |
parent | f2a97a38158219f01adfb49a161fb896efd5256c (diff) | |
download | ptxdist-73f9b0fba0dfd7e286782a342c9997b65f25f235.tar.gz ptxdist-73f9b0fba0dfd7e286782a342c9997b65f25f235.tar.xz |
cups: new package: Common Unix Printing System
If using systemd, CUPS can be started via socket activation or directly,
in any case it is run as user daemon, group lp. The default spool and
cache locations were moved to /tmp/cups so we don't need to set up a
tmpfs for /var/spool/cups and /var/cache/cups.
sysvinit script is installed from upstream, but untested.
Some config files are only created by cupsd on the first start and not
at install time, so we supply reasonable defaults in projectroot/ in
order to use $(call install_alternative...) on them.
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r-- | projectroot/etc/cups/classes.conf | 1 | ||||
-rw-r--r-- | projectroot/etc/cups/client.conf | 2 | ||||
-rw-r--r-- | projectroot/etc/cups/cups-files.conf | 22 | ||||
-rw-r--r-- | projectroot/etc/cups/mailto.conf | 1 | ||||
-rw-r--r-- | projectroot/etc/cups/ppd/.createdirectory | 0 | ||||
-rw-r--r-- | projectroot/etc/cups/printers.conf | 1 | ||||
-rw-r--r-- | projectroot/etc/cups/ssl/.createdirectory | 0 | ||||
-rw-r--r-- | projectroot/etc/printcap | 3 | ||||
-rw-r--r-- | projectroot/usr/lib/systemd/system/cups.service | 15 | ||||
-rw-r--r-- | projectroot/usr/lib/systemd/system/cups.socket | 14 | ||||
-rw-r--r-- | projectroot/usr/lib/tmpfiles.d/cups.conf | 6 |
11 files changed, 65 insertions, 0 deletions
diff --git a/projectroot/etc/cups/classes.conf b/projectroot/etc/cups/classes.conf new file mode 100644 index 000000000..dea737751 --- /dev/null +++ b/projectroot/etc/cups/classes.conf @@ -0,0 +1 @@ +# classes.conf - class configuration file for cups diff --git a/projectroot/etc/cups/client.conf b/projectroot/etc/cups/client.conf new file mode 100644 index 000000000..f8f0b6832 --- /dev/null +++ b/projectroot/etc/cups/client.conf @@ -0,0 +1,2 @@ +# CUPS client configuration +ServerName localhost diff --git a/projectroot/etc/cups/cups-files.conf b/projectroot/etc/cups/cups-files.conf new file mode 100644 index 000000000..2cc2d5a5b --- /dev/null +++ b/projectroot/etc/cups/cups-files.conf @@ -0,0 +1,22 @@ +# File/directory/user/group configuration file for the CUPS scheduler. +User daemon +Group lp +SystemGroup root + +AccessLog /var/log/cups/access_log +ErrorLog /var/log/cups/error_log +PageLog /var/log/cups/page_log + +CacheDir /tmp/cups/cache +DataDir /usr/share/cups +DocumentRoot /usr/share/doc/cups +RequestRoot /tmp/cups/spool +ServerBin /usr/lib/cups +ServerRoot /etc/cups +StateDir /var/run/cups + +Printcap /etc/printcap +PrintcapFormat bsd + +# SSL/TLS keychain for the scheduler... +#ServerKeychain ssl diff --git a/projectroot/etc/cups/mailto.conf b/projectroot/etc/cups/mailto.conf new file mode 100644 index 000000000..4502adaee --- /dev/null +++ b/projectroot/etc/cups/mailto.conf @@ -0,0 +1 @@ +# mailto.conf - configuration file for cups email notifier diff --git a/projectroot/etc/cups/ppd/.createdirectory b/projectroot/etc/cups/ppd/.createdirectory new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/projectroot/etc/cups/ppd/.createdirectory diff --git a/projectroot/etc/cups/printers.conf b/projectroot/etc/cups/printers.conf new file mode 100644 index 000000000..bf9879904 --- /dev/null +++ b/projectroot/etc/cups/printers.conf @@ -0,0 +1 @@ +# printers.conf - printer configuration file for cups diff --git a/projectroot/etc/cups/ssl/.createdirectory b/projectroot/etc/cups/ssl/.createdirectory new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/projectroot/etc/cups/ssl/.createdirectory diff --git a/projectroot/etc/printcap b/projectroot/etc/printcap new file mode 100644 index 000000000..e74f358e1 --- /dev/null +++ b/projectroot/etc/printcap @@ -0,0 +1,3 @@ +# This file was automatically generated by cupsd(8) from the +# /etc/cups/printers.conf file. All changes to this file +# will be lost. diff --git a/projectroot/usr/lib/systemd/system/cups.service b/projectroot/usr/lib/systemd/system/cups.service new file mode 100644 index 000000000..ff94f69d2 --- /dev/null +++ b/projectroot/usr/lib/systemd/system/cups.service @@ -0,0 +1,15 @@ +[Unit] +Description=CUPS Scheduler service +Documentation=man:cupsd(8) +Requires=systemd-tmpfiles-setup.service +Requires=cups.socket + +[Service] +User=daemon +Group=lp +ExecStart=/usr/sbin/cupsd -l -c /etc/cups/cupsd.conf -s /etc/cups/cups-files.conf +Type=simple + +[Install] +Also=cups.socket +WantedBy=printer.target diff --git a/projectroot/usr/lib/systemd/system/cups.socket b/projectroot/usr/lib/systemd/system/cups.socket new file mode 100644 index 000000000..de9f43b6b --- /dev/null +++ b/projectroot/usr/lib/systemd/system/cups.socket @@ -0,0 +1,14 @@ +[Unit] +Description=CUPS Scheduler socket +PartOf=cups.service + +[Socket] +ListenStream=/run/cups.sock +ListenStream=[::1]:631 +ListenStream=127.0.0.1:631 +BindIPv6Only=No +SocketUser=daemon +SocketGroup=lp + +[Install] +WantedBy=sockets.target diff --git a/projectroot/usr/lib/tmpfiles.d/cups.conf b/projectroot/usr/lib/tmpfiles.d/cups.conf new file mode 100644 index 000000000..c000cf255 --- /dev/null +++ b/projectroot/usr/lib/tmpfiles.d/cups.conf @@ -0,0 +1,6 @@ +#Type Path Mode UID GID Age Argument +d /var/log/cups 750 daemon lp - +d /tmp/cups/cache/ 750 daemon lp - +d /tmp/cups/spool/ 750 daemon lp - +d /tmp/cups/spool/tmp/ 750 daemon lp - +d /var/run/cups 750 daemon lp - |