summaryrefslogtreecommitdiffstats
path: root/remote/modules/pam/data
diff options
context:
space:
mode:
authorJonathan Bauer2013-07-03 18:35:51 +0200
committerJonathan Bauer2013-07-03 18:35:51 +0200
commit5e80d6c87af2304a8e12adb0eded423149f9aa28 (patch)
tree6735b2471b9762f1bcf04aa6a43e1eda22613fa7 /remote/modules/pam/data
parent[pam] add path to rfc_pipefs filesystem when executing rpc.gssd (needed to fi... (diff)
parent+LANG: de_DE.utf8 in /etc/profile (diff)
downloadtm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.tar.gz
tm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.tar.xz
tm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.zip
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pam/data')
-rw-r--r--remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service4
l---------remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service1
-rw-r--r--remote/modules/pam/data/etc/systemd/system/nscd.service11
3 files changed, 3 insertions, 13 deletions
diff --git a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
index a09b78ae..518681b6 100644
--- a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
+++ b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
@@ -2,5 +2,7 @@
Description=Activate NSS-LDAP lookups
[Service]
-Type=simple
+Type=oneshot
ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd.*/passwd:\t\tfiles ldap/g;s/^group.*/group:\t\tfiles ldap/g' /etc/nsswitch.conf
+ExecStart=/usr/bin/systemctl restart nscd
+
diff --git a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service b/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
deleted file mode 120000
index 70066631..00000000
--- a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
+++ /dev/null
@@ -1 +0,0 @@
-../nscd.service \ No newline at end of file
diff --git a/remote/modules/pam/data/etc/systemd/system/nscd.service b/remote/modules/pam/data/etc/systemd/system/nscd.service
deleted file mode 100644
index 262bb534..00000000
--- a/remote/modules/pam/data/etc/systemd/system/nscd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-
-[Service]
-ExecStart=/usr/sbin/nscd -d
-ExecStop=/usr/sbin/nscd --shutdown
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Also=nscd.socket