diff options
7 files changed, 26 insertions, 9 deletions
diff --git a/remote/modules/idleaction/idleaction.conf.opensuse b/remote/modules/idleaction/idleaction.conf.opensuse index 3aff5af0..d368cbd8 100644 --- a/remote/modules/idleaction/idleaction.conf.opensuse +++ b/remote/modules/idleaction/idleaction.conf.opensuse @@ -1,6 +1,6 @@ REQUIRED_INSTALLED_PACKAGES=" libX11-devel - libXss-devel + libXScrnSaver-devel xorg-x11-proto-devel " diff --git a/remote/modules/smartctl/smartctl.conf.opensuse b/remote/modules/smartctl/smartctl.conf.opensuse new file mode 100644 index 00000000..d699f2f0 --- /dev/null +++ b/remote/modules/smartctl/smartctl.conf.opensuse @@ -0,0 +1,6 @@ +REQUIRED_CONTENT_PACKAGES=" + smartmontools +" +REQUIRED_INSTALLED_PACKAGES=" + smartmontools +" diff --git a/remote/modules/vmware/data/etc/vmware/config b/remote/modules/vmware/data/etc/vmware/config index eb5d01c0..c76cc885 100644 --- a/remote/modules/vmware/data/etc/vmware/config +++ b/remote/modules/vmware/data/etc/vmware/config @@ -2,3 +2,8 @@ prefvmx.minVmMemPct = "100" prefvmx.useRecommendedLockedMemSize = "TRUE" libdir = "/usr/lib/vmware" +mks.ctlAltDel.ignore = "TRUE" +mks.fullscreen.allowScreenSaver = "TRUE" +fullScreenSwitch.onSeparateDesktop = "TRUE" +msg.autoAnswer = "TRUE" + diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 index abc28f73..d0a3bc29 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 @@ -50,7 +50,9 @@ else fi echo "Appending $MOUNTPOINT to /" -if ! mount -o "remount,add:1:$MOUNTPOINT=ro" /; then +if mount -o "remount,append:$MOUNTPOINT=ro" /; then + cp -r "${MOUNTPOINT}/"etc/ld.* /etc/ || echo "Could not really copy full blown ldconfig from stage4 to live system" +else slxlog --echo "mount-stage4" "Could not append mounted stage4 at '$MOUNTPOINT' to aufs at /" exit 1 fi @@ -62,3 +64,4 @@ systemctl reload dbus.service systemctl start stage4.target & exit 0 + diff --git a/server/modules/pam-freiburg/etc/ldap/ldap.conf b/server/modules/pam-freiburg/etc/ldap/ldap.conf index 809065cc..6050948a 100644..120000 --- a/server/modules/pam-freiburg/etc/ldap/ldap.conf +++ b/server/modules/pam-freiburg/etc/ldap/ldap.conf @@ -1,7 +1 @@ -URI ldaps://bv1.ruf.uni-freiburg.de ldaps://bv2.ruf.uni-freiburg.de ldaps://bv3.ruf.uni-freiburg.de -BASE ou=people,dc=uni-freiburg,dc=de -TLS_REQCERT allow -nss_base_passwd ou=people,dc=uni-freiburg,dc=de?one?rufdienst=ldap*)(&(rufclienthome=*)(rufstatus=enabled) -nss_base_group ou=group,dc=uni-freiburg,dc=de?one -nss_map_attribute homeDirectory rufClientHome - +../ldap.conf
\ No newline at end of file diff --git a/server/modules/pam-freiburg/etc/nslcd.conf b/server/modules/pam-freiburg/etc/nslcd.conf new file mode 100644 index 00000000..e98e1675 --- /dev/null +++ b/server/modules/pam-freiburg/etc/nslcd.conf @@ -0,0 +1,8 @@ +# Cannot be a symlink to ldap.conf, as nslcd refuses to start if there are unknown options in this file... +URI ldaps://bv1.ruf.uni-freiburg.de ldaps://bv2.ruf.uni-freiburg.de ldaps://bv3.ruf.uni-freiburg.de +BASE ou=people,dc=uni-freiburg,dc=de +BIND_TIMELIMIT 5 +TIMELIMIT 10 +TLS_REQCERT allow + +nss_initgroups_ignoreusers avahi,avahi-autoipd,backup,bin,colord,daemon,distccd,games,git,gnats,hplip,irc,kdm,kernoops,libuuid,lightdm,list,lp,mail,man,messagebus,news,ntp,proxy,pulse,root,rtkit,saned,speech-dispatcher,sshd,statd,sync,sys,syslog,usbmux,uucp,whoopsie,www-data diff --git a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/nslcd.service b/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/nslcd.service new file mode 120000 index 00000000..17c13d96 --- /dev/null +++ b/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/nslcd.service @@ -0,0 +1 @@ +../nslcd.service
\ No newline at end of file |