From 5e7f6eb60239e73c712c96d05718248386a217a6 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 17 Jan 2014 17:37:14 +0100 Subject: [idleaction] updated conf file for openSuse - builds now --- remote/modules/idleaction/idleaction.conf.opensuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 " -- cgit v1.2.3-55-g7522 From 7f9066f3912c0ac528a349dfaad0cdf78080d8b3 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 17 Jan 2014 17:53:09 +0100 Subject: [smartctl] conf file for opensuse --- remote/modules/smartctl/smartctl.conf.opensuse | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 remote/modules/smartctl/smartctl.conf.opensuse 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 +" -- cgit v1.2.3-55-g7522 From 5801781515a81edaca06a66bfe4ada2444be3efb Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 20 Jan 2014 17:42:36 +0100 Subject: [vmware] Extend some vmware config --- remote/modules/vmware/data/etc/vmware/config | 5 +++++ 1 file changed, 5 insertions(+) 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" + -- cgit v1.2.3-55-g7522 From 5291a12e65a0bb5b09fef4f273b1a76c2d427ca3 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 20 Jan 2014 17:43:06 +0100 Subject: [rfs-stage32] Append stage4 at the end of the aufs stack again and just copy the ld-config after mounting --- .../rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 + -- cgit v1.2.3-55-g7522 From 35393114bfc88490aaf8e9eac4f6808dc849844e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 21 Jan 2014 13:39:26 +0100 Subject: Add nslcd startup --- server/modules/pam-freiburg/etc/ldap/ldap.conf | 8 +------- server/modules/pam-freiburg/etc/nslcd.conf | 8 ++++++++ .../etc/systemd/system/getty.target.wants/nslcd.service | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) mode change 100644 => 120000 server/modules/pam-freiburg/etc/ldap/ldap.conf create mode 100644 server/modules/pam-freiburg/etc/nslcd.conf create mode 120000 server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/nslcd.service diff --git a/server/modules/pam-freiburg/etc/ldap/ldap.conf b/server/modules/pam-freiburg/etc/ldap/ldap.conf deleted file mode 100644 index 809065cc..00000000 --- a/server/modules/pam-freiburg/etc/ldap/ldap.conf +++ /dev/null @@ -1,7 +0,0 @@ -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 - diff --git a/server/modules/pam-freiburg/etc/ldap/ldap.conf b/server/modules/pam-freiburg/etc/ldap/ldap.conf new file mode 120000 index 00000000..6050948a --- /dev/null +++ b/server/modules/pam-freiburg/etc/ldap/ldap.conf @@ -0,0 +1 @@ +../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 -- cgit v1.2.3-55-g7522