From b248c1711cf9ac08673274a5530e22004f27b66f Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Thu, 12 Dec 2013 15:52:37 +0100
Subject: [beamergui] Start beamergui with X. Config for beamergui.

---
 server/configs/freiburg/beamer-freiburg                          | 1 +
 server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf | 2 ++
 2 files changed, 3 insertions(+)
 create mode 120000 server/configs/freiburg/beamer-freiburg
 create mode 100644 server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf

(limited to 'server')

diff --git a/server/configs/freiburg/beamer-freiburg b/server/configs/freiburg/beamer-freiburg
new file mode 120000
index 00000000..d59c77af
--- /dev/null
+++ b/server/configs/freiburg/beamer-freiburg
@@ -0,0 +1 @@
+../../modules/beamer-freiburg/
\ No newline at end of file
diff --git a/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf
new file mode 100644
index 00000000..52fc0033
--- /dev/null
+++ b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf
@@ -0,0 +1,2 @@
+[SpecificSettings]
+132.230.4.100=1280x800
-- 
cgit v1.2.3-55-g7522


From c94225616947337990ca019c3279d22a1e1bcb51 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 18:37:16 +0100
Subject: [pam-freiburg] Fix mounting of homes from sunfs6

---
 .../openslx/scripts/pam_script_mount_persistent    | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'server')

diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
index f6a295f2..d8808f66 100644
--- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
+++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
@@ -30,22 +30,26 @@ if [ $(id -g ${PAM_USER}) -ge 1000 ]; then
 
     # now we can mount the home directory!
 
-	MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy,sec=krb5p"
-
-    SIGNAL=$(mktemp)
-    rm -f -- "${SIGNAL}"
-    (mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" || touch "${SIGNAL}") &
-    MOUNT_PID=$!
-    for COUNTER in 1 2 4 4; do
-        kill -0 "${MOUNT_PID}" 2>/dev/null || break
-        sleep "${COUNTER}"
-    done
-
-    if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})"
-        rm -f -- "${SIGNAL}"
-    else
-        exit 0
-    fi
+	MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy"
+	if echo "$FILESERVER" | grep -q "sunfs6"; then
+		MOUNT_OPTS="${MOUNT_OPTS},sec=krb5i"
+	else
+		MOUNT_OPTS="${MOUNT_OPTS},sec=krb5p"
+	fi
+
+	SIGNAL=$(mktemp)
+	rm -f -- "${SIGNAL}"
+	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) &
+	MOUNT_PID=$!
+	for COUNTER in 1 2 4 4; do
+		kill -0 "${MOUNT_PID}" 2>/dev/null || break
+		sleep "${COUNTER}"
+	done
+
+	if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		rm -f -- "${SIGNAL}"
+	fi
+	rm -f -- "/tmp/home.$PAM_USER"
 fi
 
-- 
cgit v1.2.3-55-g7522


From 2f51a228ceceff446312c1daba124fb15cd5c912 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Fri, 13 Dec 2013 10:19:35 +0100
Subject: [cups] duplex on RZFARBE as standard

---
 server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd b/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd
index 4ca096d0..e649b392 100644
--- a/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd
+++ b/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd
@@ -2486,7 +2486,7 @@
 
 *OpenUI *Duplex/2-Sided Print: PickOne
 *OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
+*DefaultDuplex: DuplexNoTumble
 *Duplex None/1-Sided Print: "
         (<<) cvx exec /Duplex false /Tumble false (>>) cvx exec setpagedevice"
 *End
-- 
cgit v1.2.3-55-g7522