[28389] in Source-Commits
cluster-login-config commit: Add an Upstart override file for cups-browsed
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Aug 12 15:37:34 2014
Date: Tue, 12 Aug 2014 15:37:27 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201408121937.s7CJbRSL012152@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/cluster-login-config/commit/5cadcec88ea9be2d54ae37bf0496a6f555f53422
commit 5cadcec88ea9be2d54ae37bf0496a6f555f53422
Author: Jonathan Reed <jdreed@mit.edu>
Date: Tue Aug 12 15:16:13 2014 -0400
Add an Upstart override file for cups-browsed
Large lists of dnssd printers are confusing. Until we have a
better answer, disable cups browsing on clusters with an
override file, and also turn it off in the postinst.
debian/changelog | 6 ++++++
debian/cups-browsed.override | 1 +
debian/debathena-cluster-login-config.install | 1 +
debian/debathena-cluster-login-config.postinst | 3 +++
4 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8e3d1ec..a4f5013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-cluster-login-config (1.45) unstable; urgency=low
+
+ * Disable CUPS browsing (Trac: #1524)
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 12 Aug 2014 15:23:07 -0400
+
debathena-cluster-login-config (1.44.2) unstable; urgency=low
* Depend on debathena-ssh-server-config, since we invoke the ssh
diff --git a/debian/cups-browsed.override b/debian/cups-browsed.override
new file mode 100644
index 0000000..2905494
--- /dev/null
+++ b/debian/cups-browsed.override
@@ -0,0 +1 @@
+manual
diff --git a/debian/debathena-cluster-login-config.install b/debian/debathena-cluster-login-config.install
index b704567..d9284ab 100644
--- a/debian/debathena-cluster-login-config.install
+++ b/debian/debathena-cluster-login-config.install
@@ -9,3 +9,4 @@ debian/10-cluster-login-config etc/dconf/db/athena.d
debian/10-cluster-login-config-locks etc/dconf/db/athena.d/locks
debian/99-athena.conf usr/share/lightdm/lightdm.conf.d
debian/logo.png usr/share/debathena-cluster-login-config
+debian/cups-browsed.override etc/init
diff --git a/debian/debathena-cluster-login-config.postinst b/debian/debathena-cluster-login-config.postinst
index 0a0257c..34eec6a 100644
--- a/debian/debathena-cluster-login-config.postinst
+++ b/debian/debathena-cluster-login-config.postinst
@@ -61,6 +61,9 @@ case "$1" in
# from the snippet files we installed
dconf update
+ # Turn cups browsing off
+ initctl stop cups-browsed >/dev/null 2>&1 || true
+
exit 0
;;
