From afac4babef160c92ba32d562910c2d60ee861831 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 8 Jan 2016 14:26:46 +0100
Subject: [exam] renamed safe-mode service to 'exam.service' and removed
 unneeded code

removed the iptables script to only allow the institution network (e.g. 132.230.x.x)
This needs to be done elsewhere!
---
 .../system/basic.target.wants/safe-mode.service    |  1 -
 .../safe-mode/data/etc/systemd/system/exam.service |  6 ++++
 .../data/etc/systemd/system/safe-mode.service      |  6 ----
 .../openslx/iptables/rules.d/00-internal-network   | 16 ----------
 .../data/opt/openslx/scripts/systemd-safe_mode     | 35 ----------------------
 5 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 120000 remote/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service
 create mode 100644 remote/modules/safe-mode/data/etc/systemd/system/exam.service
 delete mode 100644 remote/modules/safe-mode/data/etc/systemd/system/safe-mode.service
 delete mode 100755 remote/modules/safe-mode/data/opt/openslx/iptables/rules.d/00-internal-network

diff --git a/remote/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service b/remote/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service
deleted file mode 120000
index c063e1a0..00000000
--- a/remote/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service
+++ /dev/null
@@ -1 +0,0 @@
-../safe-mode.service
\ No newline at end of file
diff --git a/remote/modules/safe-mode/data/etc/systemd/system/exam.service b/remote/modules/safe-mode/data/etc/systemd/system/exam.service
new file mode 100644
index 00000000..ba11c034
--- /dev/null
+++ b/remote/modules/safe-mode/data/etc/systemd/system/exam.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Sets up safe mode (local network, no tty switch, no openbox menu)
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-safe_mode
diff --git a/remote/modules/safe-mode/data/etc/systemd/system/safe-mode.service b/remote/modules/safe-mode/data/etc/systemd/system/safe-mode.service
deleted file mode 100644
index ba11c034..00000000
--- a/remote/modules/safe-mode/data/etc/systemd/system/safe-mode.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Sets up safe mode (local network, no tty switch, no openbox menu)
-
-[Service]
-Type=oneshot
-ExecStart=/opt/openslx/scripts/systemd-safe_mode
diff --git a/remote/modules/safe-mode/data/opt/openslx/iptables/rules.d/00-internal-network b/remote/modules/safe-mode/data/opt/openslx/iptables/rules.d/00-internal-network
deleted file mode 100755
index a3a1b033..00000000
--- a/remote/modules/safe-mode/data/opt/openslx/iptables/rules.d/00-internal-network
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/ash
-
-. /opt/openslx/config
-
-[ -z "$SLX_BROWSER_START_URL" ] && exit 0
-
-# identify subnet of br0's ip adress
-[ -z "$SLX_PXE_CLIENT_IP" ] && echo "No client IP found in '/opt/openslx/config'." && exit 1
-
-# lets build the subnet string
-SLX_LOCAL_SUBNET="$(echo "${SLX_PXE_CLIENT_IP}" | awk -F "." '{print $1"."$2".0.0/16"}')"
-[ -z "${SLX_LOCAL_SUBNET}" ] && echo "No ip range to allow. Exiting..." && exit 1
-# now create the iptables rule for openslx-iptables stuff
-# first as a temp file, then we move it to the real destination
-iptables -A INPUT -i br0 -p tcp -s "${SLX_LOCAL_SUBNET}" -j ACCEPT
-iptables -A INPUT -i br0 -p tcp -j REJECT
diff --git a/remote/modules/safe-mode/data/opt/openslx/scripts/systemd-safe_mode b/remote/modules/safe-mode/data/opt/openslx/scripts/systemd-safe_mode
index 6e66b35d..ebcee099 100755
--- a/remote/modules/safe-mode/data/opt/openslx/scripts/systemd-safe_mode
+++ b/remote/modules/safe-mode/data/opt/openslx/scripts/systemd-safe_mode
@@ -19,41 +19,6 @@ disable_magic_keys() {
 	echo 0 > /proc/sys/kernel/sysrq
 }
 
-disable_cron_idleaction() {
-	rm /opt/openslx/scripts/idleaction-cron_script \
-		/opt/openslx/scripts/idleaction-scheduled_poweroff \
-		/opt/openslx/scripts/idleaction-scheduled_reboot
-}
-
-disable_systemd_auto_vt() {
-	sed -i 's/.*NAutoVTs=.*/NAutoVTs=0/g' "/etc/systemd/logind.conf"
-	systemctl restart systemd-logind
-}
-
-set_default_session() {
-	[ ! -e "/usr/share/xsessions/firefox.desktop" ] && \
-		echo "No firefox session found." && return 1
-	# we have it, copy it over default session
-	cp "/usr/share/xsessions/firefox.desktop" "/opt/openslx/xsessions/default.desktop"
-}
-
-no_autologin_delay() {
-	[ ! -e "/etc/kde4/kdm/kdmrc" ] && \
-		echo "Could not find '/etc/kde4/kdm/kdmrc'." && return 1
-	sed -i 's/^AutoLoginDelay=.*/AutoLoginDelay=0/g' "/etc/kde4/kdm/kdmrc"
-}
-
-
-. /opt/openslx/config
-
-[ -z "$SLX_BROWSER_START_URL" ] && \
-	echo "Not running in E-Klausur mode!" && \
-	exit 1
-
 disable_tty_switch
 disable_openbox_menu
 disable_magic_keys
-disable_cron_idleaction
-disable_systemd_auto_vt
-no_autologin_delay
-set_default_session
-- 
cgit v1.2.3-55-g7522