[debian-edu-commits] debian-edu/ 01/01: Add /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf as additional cups config file to enable listening on www:631.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 8f64d0f2e4eee51a84a6940b75e8d3aa6a251ac6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Aug 31 18:07:09 2014 +0200

    Add /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf as
    additional cups config file to enable listening on www:631.
---
 Makefile                                                      | 1 +
 debian/changelog                                              | 7 +++++++
 etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/Makefile b/Makefile
index dafd59f..eeb88ca 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,7 @@ SYSCONFFILES = \
 	cfengine/update.conf \
 	cfengine/inputs/cfagent.conf \
 	cups/cupsd-debian-edu.conf \
+	systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf \
 	dhcp/dhclient-exit-hooks.d/wpad-proxy-update \
 	dhcp/dhclient-exit-hooks.d/fetch-ldap-cert \
 	dhcp/dhclient-exit-hooks.d/hostname \
diff --git a/debian/changelog b/debian/changelog
index 82d7470..441d002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-config (1.724) UNRELEASED; urgency=low
+
+  * Add /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
+    as additional cups config file to enable listening on www:631.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 31 Aug 2014 18:02:19 +0200
+
 debian-edu-config (1.723) unstable; urgency=high
 
   * Fix typo in shell test in sssd-generate-config.
diff --git a/etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf b/etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
new file mode 100644
index 0000000..5caf347
--- /dev/null
+++ b/etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
@@ -0,0 +1,7 @@
+[Socket]
+# This file is shipped with debian-edu-config. It has to be kept
+# in sync with the Port and Listen stanzas in /etc/cups/cupsd.conf
+# and is symlinked during setup as cups-listen.conf in this directory.
+ListenStream=0.0.0.0:631
+ListenStream=[::]:631
+ListenStream=www:631

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git