Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

4 files changed, 44 insertions, 10 deletions

diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index 3f0d8861..b678fdd6 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -28,12 +28,13 @@ build() {
 	tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
 
 	# build pam-script separatly since we use a source tarball
+
 	# HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at
-	cd "$MODULE_BUILD_DIR"
-	local PAM_UNIX_LOCATION=$(find . -name pam_unix.so)
 	cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}."
-	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed."
+	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed."
 	make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed."
+
+
 	# openSuse 13.1 has no package nss-pam-ldapd. So, we compile it.
 	if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
 		cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION"
@@ -46,7 +47,7 @@ build() {
 		cd "$MODULE_BUILD_DIR"
 		local NSLCD_PATH=$(which nslcd)
 	fi
-	[ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
+	[[ $REQUIRED_BINARIES = *nslcd* ]] && [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
 	# Build nslcd service file
 	mkdir -p "etc/systemd/system"
 	sed "s,%PATH%,$NSLCD_PATH,g" "$MODULE_DIR/templates/nslcd-systemd.service" > "etc/systemd/system/nslcd.service" || perror "Could not fill nslcd.service template"
diff --git a/remote/modules/pam/module.conf.centos b/remote/modules/pam/module.conf.centos
new file mode 100644
index 00000000..5dadea53
--- /dev/null
+++ b/remote/modules/pam/module.conf.centos
@@ -0,0 +1,36 @@
+# erase generic conf settings
+REQUIRED_BINARIES=""
+REQUIRED_FILES=""
+REQUIRED_INSTALLED_PACKAGES="
+	pam
+	pam-devel
+	pam_krb5
+	libnfsidmap
+	nss-mdns
+	openssl-devel
+	nfs-utils
+	glibc
+"
+REQUIRED_CONTENT_PACKAGES="
+	pam
+	pam-devel
+	pam_krb5
+	libnfsidmap
+	nss-mdns
+	nfs-utils
+	glibc
+"
+REQUIRED_LIBRARIES+="
+	libnss_compat
+	libnss_db
+	libnss_dns
+	libnss_files
+	libnss_nis
+"
+REQUIRED_DIRECTORIES+="
+	/$LIB64
+"
+REQUIRED_SYSTEM_FILES+="
+	$SYS_PAM_MODULES_PATH
+"
+
diff --git a/remote/modules/pam/module.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu
index 31023197..4a3635fc 100644
--- a/remote/modules/pam/module.conf.ubuntu
+++ b/remote/modules/pam/module.conf.ubuntu
@@ -39,13 +39,11 @@ REQUIRED_BINARIES+="
 	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
 	/lib
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
 	/etc/pam.conf
 	/etc/default/locale
-	/lib/security
-	/lib/${ARCH_TRIPLET}/security
-	/sbin/mkhomedir_helper
 "
diff --git a/remote/modules/pam/module.conf.ubuntu.14 b/remote/modules/pam/module.conf.ubuntu.14
index 2f46770c..26307d84 100644
--- a/remote/modules/pam/module.conf.ubuntu.14
+++ b/remote/modules/pam/module.conf.ubuntu.14
@@ -39,20 +39,19 @@ REQUIRED_BINARIES+="
 	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
 	/lib
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
 	/etc/pam.conf
 	/etc/default/locale
-	/lib/${ARCH_TRIPLET}/security
-	/sbin/mkhomedir_helper
 "
 
 # For Ubuntu 14.04: Both packages were dropped from official repos. Do not change the
 # order, as these packages will be installed via dpkg and depend on each other.
 REQUIRED_DOWNLOAD_URLS="
-	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb	
+	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb
 	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libpam-ncp_2.2.6-9ubuntu1_amd64.deb
 	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/ncpfs_2.2.6-9ubuntu1_amd64.deb
 "