Make sure that the libpam-arvados package puts its various files in the place

where the pam subsystem will expect them, not inside the virtualenv.

Also, remove the code from sdk/pam/setup.py that installed a copy of the
libpam-arvados.py file under /usr/data/lib/security/libpam_arvados.py for
legacy reasons.

refs #9945
refs #15186

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 141c49e62182a28030ce9690727993dfe06e6610..1aa3e3cfd1147ebe15b0c041637a055b015f3c93 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -638,10 +638,13 @@ fpm_build_virtualenv () {
     done
   fi
 
-  # the libpam module should place this file in the historically correct place
-  # so as not to break backwards compatibility
-  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/libpam-arvados/lib/security/libpam_arvados.py" ]]; then
-    COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/data/lib/security/libpam_arvados.py=/usr/data/lib/security/")
+  # the libpam module should place a few files in the correct place for the pam
+  # subsystem
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/$PYTHON_PKG/lib/security/libpam_arvados.py" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/lib/security/libpam_arvados.py=/usr/lib/security/")
+  fi
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/$PYTHON_PKG/share/pam-configs/arvados" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/share/pam-configs/arvados=/usr/share/pam-configs/")
   fi
 
   # the python-arvados-cwl-runner package comes with cwltool, expose that version

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index c94f5b41f5b674beaf7b41989d6ec6f0a84329e9..9bc2cef60169b674a51d6ae3cffc24662aaa78df 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -42,13 +42,6 @@ setup(name='arvados-pam',
           ('share/pam-configs', ['pam-configs/arvados']),
           ('share/doc/arvados-pam', ['LICENSE-2.0.txt', 'README.rst']),
           ('share/doc/arvados-pam/examples', glob.glob('examples/*')),
-
-          # The arvados build scripts used to install data files to
-          # "/usr/data/*" but now install them to "/usr/*". Here, we
-          # install an extra copy in the old location so existing pam
-          # configs can still work. When old systems have had a chance
-          # to update to the new paths, this line can be removed.
-          ('data/lib/security', ['lib/libpam_arvados.py']),
       ],
       install_requires=[
           'arvados-python-client>=0.1.20150801000000',