[debian-edu-commits] debian-edu/ 01/04: Revert commits 321e0b02d88d58aa1fd6fe6cb3d8d398d5f46da7 and 8f64d0f2e4eee51a84a6940b75e8d3aa6a251ac6 after discussing with Wolfgang and agreeing that we keep the default CIPS setup of only listening on port 631 for localhost.

[Petter Reinholdtsen]

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

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

commit 90640a87bd912cc31d01da1109280bd19f8211b0
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Sep 1 08:50:40 2014 +0200

    Revert commits 321e0b02d88d58aa1fd6fe6cb3d8d398d5f46da7 and
    8f64d0f2e4eee51a84a6940b75e8d3aa6a251ac6 after discussing
    with Wolfgang and agreeing that we keep the default CIPS
    setup of only listening on port 631 for localhost.
---
 Makefile                                                      | 1 -
 cf/cf.cups                                                    | 6 ------
 debian/changelog                                              | 8 --------
 etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf | 7 -------
 4 files changed, 22 deletions(-)

diff --git a/Makefile b/Makefile
index eeb88ca..dafd59f 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,6 @@ 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/cf/cf.cups b/cf/cf.cups
index 6984687..4dd1877 100644
--- a/cf/cf.cups
+++ b/cf/cf.cups
@@ -1,11 +1,5 @@
-shellcommands:
-
-  debian.installation::
-    "/bin/rm /etc/systemd/system/cups.socket.d/cupsd-listen.conf"
-
 links:
 
   debian.installation::
 
     /etc/cups/cupsd.conf ->! /etc/cups/cupsd-debian-edu.conf
-    /etc/systemd/system/cups.socket.d/cupsd-listen.conf ->! /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index e75ddac..82d7470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-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.
-  * Adjust cf/cups to manage the new config file.
-
- -- 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
deleted file mode 100644
index 5caf347..0000000
--- a/etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[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