From 3893788e1cc74114e015ea483f0180b08959f9c2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 29 Jan 2014 16:00:02 +0100
Subject: [pam-freiburg] deleted unneeded nss-ldap hack, since with nss-ldapd
 its ok to have the ldap switch in the nsswitch before ldap is actually
 "queryable"

---
 server/modules/pam-freiburg/etc/nsswitch.conf         | 19 +++++++++++++++++++
 .../etc/systemd/system/activate-nss-ldap.service      | 10 ----------
 .../getty.target.wants/activate-nss-ldap.service      |  1 -
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 server/modules/pam-freiburg/etc/nsswitch.conf
 delete mode 100644 server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
 delete mode 120000 server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service

(limited to 'server/modules')

diff --git a/server/modules/pam-freiburg/etc/nsswitch.conf b/server/modules/pam-freiburg/etc/nsswitch.conf
new file mode 100644
index 00000000..85c1719a
--- /dev/null
+++ b/server/modules/pam-freiburg/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc-reference' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd:         cache compat ldap
+group:          cache compat ldap
+shadow:         compat
+
+hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis
diff --git a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
deleted file mode 100644
index 664f7dd7..00000000
--- a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Activate NSS-LDAP lookups
-Before=graphical.target
-
-[Service]
-Type=oneshot
-ExecStart=-/opt/openslx/bin/mkdir /tmp/ldap
-ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd:.*$/passwd:\t\tcache files ldap/;s/^group:.*$/group:\t\tcache files ldap/' /etc/nsswitch.conf
-ExecStart=/usr/bin/systemctl restart nscd
-
diff --git a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service
deleted file mode 120000
index 1102840c..00000000
--- a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service
+++ /dev/null
@@ -1 +0,0 @@
-../activate-nss-ldap.service
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522