[freiburg] restructuring pam-freiburg module before renaming

9 files changed, 13 insertions, 34 deletions

diff --git a/server/modules/pam-freiburg/etc/ldap.conf b/server/modules/pam-freiburg/etc/ldap.conf
deleted file mode 100644
index 483595d2..00000000
--- a/server/modules/pam-freiburg/etc/ldap.conf
+++ /dev/null
@@ -1,11 +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
-BIND_TIMELIMIT 5
-TIMELIMIT 10
-LOGDIR /tmp/ldap
-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
-
-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/ldap/ldap.conf b/server/modules/pam-freiburg/etc/ldap/ldap.conf
index 6050948a..3e7dad17 120000..100644
--- a/server/modules/pam-freiburg/etc/ldap/ldap.conf
+++ b/server/modules/pam-freiburg/etc/ldap/ldap.conf
@@ -1 +1,11 @@
-../ldap.conf
\ No newline at end of file
+URI ldaps://ldap.ruf.uni-freiburg.de 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
+LOGDIR /tmp/ldap
+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
+
+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/nsswitch.conf b/server/modules/pam-freiburg/etc/nsswitch.conf
index 85c1719a..94e5c180 100644
--- a/server/modules/pam-freiburg/etc/nsswitch.conf
+++ b/server/modules/pam-freiburg/etc/nsswitch.conf
@@ -4,8 +4,8 @@
 # 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
+passwd:         cache compat sss
+group:          cache compat sss
 shadow:         compat
 
 hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
diff --git a/server/modules/pam-freiburg/etc/openldap/ldap.conf b/server/modules/pam-freiburg/etc/openldap/ldap.conf
deleted file mode 120000
index c0aaf459..00000000
--- a/server/modules/pam-freiburg/etc/openldap/ldap.conf
+++ /dev/null
@@ -1 +0,0 @@
-/etc/ldap.conf
\ No newline at end of file
diff --git a/server/modules/sssd-freiburg/etc/pam.d/common-account b/server/modules/pam-freiburg/etc/pam.d/common-account
index 179158f7..179158f7 100644
--- a/server/modules/sssd-freiburg/etc/pam.d/common-account
+++ b/server/modules/pam-freiburg/etc/pam.d/common-account
diff --git a/server/modules/sssd-freiburg/etc/pam.d/common-auth b/server/modules/pam-freiburg/etc/pam.d/common-auth
index e04c5c74..e04c5c74 100644
--- a/server/modules/sssd-freiburg/etc/pam.d/common-auth
+++ b/server/modules/pam-freiburg/etc/pam.d/common-auth
diff --git a/server/modules/sssd-freiburg/etc/pam.d/common-session b/server/modules/pam-freiburg/etc/pam.d/common-session
index be55be0d..be55be0d 100644
--- a/server/modules/sssd-freiburg/etc/pam.d/common-session
+++ b/server/modules/pam-freiburg/etc/pam.d/common-session
diff --git a/server/modules/sssd-freiburg/etc/sssd/sssd.conf b/server/modules/pam-freiburg/etc/sssd/sssd.conf
index 7b3d7b51..7b3d7b51 100644
--- a/server/modules/sssd-freiburg/etc/sssd/sssd.conf
+++ b/server/modules/pam-freiburg/etc/sssd/sssd.conf
diff --git a/server/modules/sssd-freiburg/etc/nsswitch.conf b/server/modules/sssd-freiburg/etc/nsswitch.conf
deleted file mode 100644
index 94e5c180..00000000
--- a/server/modules/sssd-freiburg/etc/nsswitch.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# /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 sss
-group:          cache compat sss
-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