diff options
| author | Simon Rettberg | 2013-06-20 12:20:44 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-20 12:20:44 +0200 |
| commit | d1010614fea8d05a267a9fa188be0b54dc851447 (patch) | |
| tree | f9db35a201beb09ddfa85d6bcf43a778f9a97f25 /remote/modules/pam | |
| parent | new option for remote mode '-n' to mount local builds (remote/builds/) to /ex... (diff) | |
| download | tm-scripts-d1010614fea8d05a267a9fa188be0b54dc851447.tar.gz tm-scripts-d1010614fea8d05a267a9fa188be0b54dc851447.tar.xz tm-scripts-d1010614fea8d05a267a9fa188be0b54dc851447.zip | |
[pam] Add missing content packages
[redsocks] fix path of redsocks binary, exclude proxy IP from redirection
Diffstat (limited to 'remote/modules/pam')
| -rw-r--r-- | remote/modules/pam/pam.build | 15 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build index 60e18414..d3c0dd88 100644 --- a/remote/modules/pam/pam.build +++ b/remote/modules/pam/pam.build @@ -5,7 +5,9 @@ fetch_source() { build() { mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/sslconnect" "$MODULE_DIR/sslconnect.c" -lssl -lcrypto -O3 || perror "Could not compile sslconnect.c" - tarcopy "$(list_packet_files | sort -u)" "${MODULE_BUILD_DIR}" + local COPYLIST="$MODULE_BUILD_DIR/list_packet_files" + list_packet_files | sort -u > "$COPYLIST" + tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}" } post_copy() { @@ -14,10 +16,13 @@ post_copy() { fi # find libnfsidmap run-time library directory - SEARCH=$(dirname "$(list_packet_files | sort -u | grep "/libsnfsidmap/"|head -1)") - if [ -d "${SEARCH}" ]; then - tarcopy "${SEARCH}" "${TARGET_BUILD_DIR}" || pinfo "Something went wrong copying $SEARCH" - fi + #local COPYLIST="$MODULE_BUILD_DIR/list_packet_files" + #local SEARCH=$(grep "/libsnfsidmap/" "$COPYLIST" | head -1) + #[ -z "$SEARCH" ] && perror "Hä" + #SEARCH=$(dirname "$SEARCH") + #if [ -d "${SEARCH}" ]; then + # tarcopy "${SEARCH}" "${TARGET_BUILD_DIR}" || pinfo "Something went wrong copying $SEARCH" + #fi } diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index f932749c..bbdd610f 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -8,6 +8,7 @@ REQUIRED_INSTALLED_PACKAGES=" libssl-dev ldap-utils libnfsidmap2 + nfs-common " REQUIRED_CONTENT_PACKAGES=" libpam0g @@ -22,7 +23,9 @@ REQUIRED_CONTENT_PACKAGES=" krb5-config libpam-krb5 libpam-mount + ldap-utils libnfsidmap2 + nfs-common " REQUIRED_BINARIES=" rpc.gssd @@ -36,6 +39,12 @@ REQUIRED_BINARIES=" umount.crypto_LUKS ldapsearch " +REQUIRED_LIBRARIES=" + nsswitch + static + umich_ldap + libnfsidmap +" REQUIRED_DIRECTORIES=" /lib /usr/lib |