[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: share/glib-2.0/schemas/31_debian-edu+mate.gschema.override: Add various...

Mike Gabriel (@sunweaver) gitlab at salsa.debian.org
Fri Jan 14 21:47:37 GMT 2022



Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
629ad022 by Mike Gabriel at 2022-01-14T22:40:30+01:00
share/glib-2.0/schemas/31_debian-edu+mate.gschema.override: Add various long-term-used MATE settings overrides (some from Ubuntu MATE).

- - - - -
10345d0f by Mike Gabriel at 2022-01-14T22:43:48+01:00
MATE screensaver: Offer "logout user" button on screensaver dialog after 40min of inactivity and allow other users to salvage a workstation from an idle user (session).

- - - - -


4 changed files:

- Makefile
- debian/changelog
- + share/debian-edu-config/tools/goodbye-user-session
- share/glib-2.0/schemas/31_debian-edu+mate.gschema.override


Changes:

=====================================
Makefile
=====================================
@@ -278,6 +278,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/gosa-sync \
 		share/debian-edu-config/tools/gosa-sync-dns-nfs \
 		share/debian-edu-config/tools/gosa-unlock-user \
+		share/debian-edu-config/tools/goodbye-user-session \
 		share/debian-edu-config/tools/firefox-plugin-support \
 		share/debian-edu-config/tools/kerberos-kdc-init \
 		share/debian-edu-config/tools/ldap2bind-updatezonelist \


=====================================
debian/changelog
=====================================
@@ -4,6 +4,13 @@ debian-edu-config (2.12.16) UNRELEASED; urgency=medium
   * etc/exim4/exim-ldap-server-v4.conf: Accept incoming mail from internal
     network sent to root@<mynetwork-names>. (Closes: #1003727).
 
+  [ Mike Gabriel ]
+  * share/glib-2.0/schemas/31_debian-edu+mate.gschema.override: Add various
+    long-term-used MATE settings overrides (some from Ubuntu MATE).
+  * MATE screensaver: Offer "logout user" button on screensaver dialog after
+    40min of inactivity and allow other users to salvage a workstation from
+    an idle user (session).
+
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 14 Jan 2022 22:21:27 +0100
 
 debian-edu-config (2.12.15) unstable; urgency=medium


=====================================
share/debian-edu-config/tools/goodbye-user-session
=====================================
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright (C) 2017-2021 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+if [ $EUID -ge 500 ]; then
+
+	# safety net for well-known browsers
+	pkill -TERM -u "${LOGNAME}" x-www-browser
+	pkill -TERM -u "${LOGNAME}" firefox-esr
+	pkill -TERM -u "${LOGNAME}" firefox
+	pkill -TERM -u "${LOGNAME}" iceweasel
+	pkill -TERM -u "${LOGNAME}" chromium
+	pkill -TERM -u "${LOGNAME}" chrome
+	pkill -TERM -u "${LOGNAME}" konqueror
+	pkill -TERM -u "${LOGNAME}" midori
+	pkill -TERM -u "${LOGNAME}" opera
+	sleep 1
+
+	# dump all other processes the hard way...
+	pkill -KILL -u "${LOGNAME}"
+
+else
+
+	echo "$(basename $0): System accounts are not allowed to be terminated by this script."
+
+fi
+
+exit 0


=====================================
share/glib-2.0/schemas/31_debian-edu+mate.gschema.override
=====================================
@@ -14,3 +14,24 @@ theme='Menta'
 
 [org.mate.peripherals-mouse]
 cursor-theme='menta'
+
+[org.mate.screensaver]
+lock-delay=5
+logout-delay=40
+logout-enabled=true
+logout-command='/usr/share/debian-edu-config/tools/goodbye-user-session'
+
+[org.mate.screensaver]
+picture-filename='/usr/share/images/desktop-base/desktop-background'
+
+[org.mate.session]
+idle-delay=15
+
+[org.mate.peripherals-touchpad]
+disable-while-typing=false
+
+[org.mate.SettingsDaemon.plugins.media-keys]
+logout='<Alt>l'
+
+[org.mate.session]
+logout-timeout=10



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d8d3648754639f3b70269a1f14874dc4e55ae5d7...10345d0f6d55a0982f08b74160d28e9ac743c4fc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d8d3648754639f3b70269a1f14874dc4e55ae5d7...10345d0f6d55a0982f08b74160d28e9ac743c4fc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20220114/ea53fdce/attachment-0001.htm>


More information about the debian-edu-commits mailing list