summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2014-10-23 20:58:17 +0200
committerDidier Raboud <odyx@debian.org>2014-10-23 21:00:27 +0200
commit702c8665479e31a012db7329ca7ab4d42d7819af (patch)
tree409c7e4d016b35b659b113544d8135dfcec2e891
parent5d45427def77292da3cd84329856f3d793c412f6 (diff)
downloadcups-702c8665479e31a012db7329ca7ab4d42d7819af.tar.gz
Create two cups socket configuration examples, document their existence in README.Debian
-rw-r--r--debian/cups-daemon.examples2
-rw-r--r--debian/cups-socket.localhost.conf7
-rw-r--r--debian/cups-socket.public.conf8
-rw-r--r--debian/libcups2.README.Debian4
4 files changed, 19 insertions, 2 deletions
diff --git a/debian/cups-daemon.examples b/debian/cups-daemon.examples
new file mode 100644
index 00000000..54e0d030
--- /dev/null
+++ b/debian/cups-daemon.examples
@@ -0,0 +1,2 @@
+debian/cups-socket.localhost.conf
+debian/cups-socket.public.conf
diff --git a/debian/cups-socket.localhost.conf b/debian/cups-socket.localhost.conf
new file mode 100644
index 00000000..8475d7df
--- /dev/null
+++ b/debian/cups-socket.localhost.conf
@@ -0,0 +1,7 @@
+# This file goes in /etc/systemd/system/cups.socket.d/
+# Configures CUPS to only listen on localhost
+[Socket]
+# IPv4
+ListenStream=127.0.0.1:631
+# IPv6
+ListenStream=[::1]:631
diff --git a/debian/cups-socket.public.conf b/debian/cups-socket.public.conf
new file mode 100644
index 00000000..2ef2199e
--- /dev/null
+++ b/debian/cups-socket.public.conf
@@ -0,0 +1,8 @@
+# This file goes in /etc/systemd/system/cups.socket.d/
+# Configures CUPS to listen broadly
+[Socket]
+FreeBind=true
+# IPv4
+ListenStream=0.0.0.0:631
+# IPv6
+ListenStream=[::]:631
diff --git a/debian/libcups2.README.Debian b/debian/libcups2.README.Debian
index 7a1e3caa..307eb486 100644
--- a/debian/libcups2.README.Debian
+++ b/debian/libcups2.README.Debian
@@ -131,8 +131,8 @@ Socket-activation under systemd
Since 1.7.1-7, when systemd is the active init system, CUPS can be
configured to be socket-activated; it will then only be launched on accesses to
its sockets. The socket definition in /lib/systemd/system/cups.socket gets
-configured through all files in /etc/systemd/system/cups.socket.d/; see
-systemd.unit(5).
+configured through files in /etc/systemd/system/cups.socket.d/; see
+systemd.unit(5) and the examples files in /usr/share/doc/cups-daemon/examples .
CUPS opens its listening ports based on 'Port' and 'Listen' stanzas in
/etc/cups/cupsd.conf. For systemd's socket activation to working, cups.socket