[debian-edu-commits] debian-edu/ 26/32: DebConf: Provide option to system-wide setup XDG autostart for iTALC client applet. (Closes: #731476).

[Mike Gabriel]

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

sunweaver pushed a commit to annotated tag debian/1_2.0.2+dfsg1-1
in repository italc.

commit 205f5e48fa7811410fa142ca3eb8691d2ca819f5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 18 14:42:31 2014 +0200

    DebConf: Provide option to system-wide setup XDG autostart for iTALC client applet. (Closes: #731476).
---
 debian/italc-client.config    |  3 +++
 debian/italc-client.install   |  4 ++--
 debian/italc-client.postinst  | 23 +++++++++++++++++++++++
 debian/italc-client.postrm    |  7 ++++++-
 debian/italc-client.templates | 14 ++++++++++++++
 debian/rules                  |  6 ++++++
 6 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/debian/italc-client.config b/debian/italc-client.config
index a07f480..d47eb32 100755
--- a/debian/italc-client.config
+++ b/debian/italc-client.config
@@ -181,3 +181,6 @@ if [ "$create_keypairs" = "true" ]; then
 	fi
 
 fi
+
+db_input high italc-client/autostart-on-login || true
+db_go
diff --git a/debian/italc-client.install b/debian/italc-client.install
index 7ae9222..3bdd0d6 100644
--- a/debian/italc-client.install
+++ b/debian/italc-client.install
@@ -1,5 +1,5 @@
-usr/bin/ica
 usr/bin/italc_auth_helper
 usr/share/italc/*
+../../debian/desktop/italc-client-autostart.desktop /usr/share/applications/
 ../../debian/desktop/italc-client.desktop /usr/share/applications/
-../../debian/config/iTALC.conf.in /usr/share/italc/
\ No newline at end of file
+../../debian/config/iTALC.conf.in /usr/share/italc/
diff --git a/debian/italc-client.postinst b/debian/italc-client.postinst
index 6cca8a1..29e6392 100755
--- a/debian/italc-client.postinst
+++ b/debian/italc-client.postinst
@@ -168,6 +168,29 @@ case "$1" in
 					    -e "s/ITALC_GROUP_STUDENT/$student_group/"
 				fi
 			fi
+
+			# Set permissions for /etc/italc/keys/public/.
+			# The permissions and group ownership found for this directory
+			# are essential for the iTALC Client startup (via the wrapper
+			# script in /usr/bin/ica).
+			if [ "$italc_key_access_for_groups" = "true" ]; then
+				if [ "x$student_group" != "x" ]; then
+					chown -Rf :$student_group "/etc/italc/keys/public"
+				else
+					chown -Rf :root "/etc/italc/keys/public"
+				fi
+				chmod 0750 "/etc/italc/keys/public"
+			fi
+
+		fi
+
+		db_get italc-client/autostart-on-login
+		if [ "$RET" = "true" ] && [ ! -e /etc/xdg/autostart/italc-client-autostart.desktop ]; then
+			echo "Setting up system-wide XDG autostart for iTALC client."
+			ln -sf /usr/share/applications/italc-client-autostart.desktop /etc/xdg/autostart/italc-client-autostart.desktop
+		elif [ "$RET" = "false" ] && [ -L /etc/xdg/autostart/italc-client-autostart.desktop ]; then
+			echo "Disabling system-wide XDG autostart for iTALC client."
+			rm -f /etc/xdg/autostart/italc-client-autostart.desktop
 		fi
 		;;
 
diff --git a/debian/italc-client.postrm b/debian/italc-client.postrm
index 7ba4dd3..31fa1b5 100755
--- a/debian/italc-client.postrm
+++ b/debian/italc-client.postrm
@@ -21,7 +21,12 @@ case "$1" in
 		rm -rf /etc/italc
 		rm -rf /etc/xdg/iTALC\ Solutions
 		;;
-	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	remove)
+		if [ -L /etc/xdg/autostart/italc-client.desktop ]; then
+			rm -f /etc/xdg/autostart/italc-client.desktop
+		fi
+		;;
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 		;;
 	*)
 		echo "postrm called with unknown argument \`$1'" >&2
diff --git a/debian/italc-client.templates b/debian/italc-client.templates
index d744764..66f9e09 100644
--- a/debian/italc-client.templates
+++ b/debian/italc-client.templates
@@ -151,3 +151,17 @@ _Description: Make iTALC's SSL keys accessible to the role model groups?
  If you skip this step, iTALC SSL keys will only be accessible to the
  super-user "root" and you will have to manually set up file permissions
  on the keys later.
+
+Template: italc-client/autostart-on-login
+Type: boolean
+Default: false
+_Description: Start the iTALC client on desktop session startup?
+ For the desktop session to be controlled via iTALC, the iTALC client
+ applet needs to be running, listening on a TCP/IP socket for authorized
+ VNC-like connections from the iTALC master application.
+ .
+ It can be configured to start automatically on desktop session startup,
+ but for security reasons this is not the default.
+ .
+ Remember that the iTALC client will only launch for users that are
+ members of the iTALC student group.
diff --git a/debian/rules b/debian/rules
index 2b1a19c..6a437c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,12 @@ common-install-arch:: debian/italc.xpm
 	install -D -m 644 debian/config/iTALC.conf.in debian/italc-client/etc/xdg/iTALC\ Solutions/iTALC.conf
 	ln -s ../xdg/iTALC\ Solutions/iTALC.conf debian/italc-client/etc/italc/italc.conf
 
+install/italc-client::
+	mkdir -p debian/italc-client/usr/bin/
+	mkdir -p debian/italc-client/usr/lib/italc/
+	mv -f debian/tmp/usr/bin/ica debian/italc-client/usr/lib/italc/ica
+	cp    debian/bin/ica debian/italc-client/usr/bin/ica
+
 clean::
 	find debian/qm.bak/*.qm | while read qm; do cp -av $$qm lib/resources/; done
 	rm -Rf debian/qm.bak/

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