Use relative data_files paths so package is installable in a virtualenv. refs #6934

Unfortunately this also means /usr/pam-configs/arvados moves to
/usr/local/pam-configs/arvados, where pam-auth-update(8) does not see
it.

diff --git a/sdk/pam/MANIFEST.in b/sdk/pam/MANIFEST.in
index 39211b37901d7956841909465a40cb7cf0b45e88..c17568cce9d1b6e85d86ec76a7f476862414fdef 100644 (file)
--- a/sdk/pam/MANIFEST.in
+++ b/sdk/pam/MANIFEST.in
@@ -1,3 +1,4 @@
 include README.rst
+include examples/shellinabox
 include lib/libpam_arvados.py
 include pam-configs/arvados

diff --git a/sdk/pam/examples/shellinabox b/sdk/pam/examples/shellinabox
index 3f5fe62af18b47cbd76b9ae7293e40ac27a04681..2d91ccb1f45a5db9547f5f8fb8c008e62f5ce3de 100644 (file)
--- a/sdk/pam/examples/shellinabox
+++ b/sdk/pam/examples/shellinabox
@@ -9,7 +9,7 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 session       required   pam_env.so readenv=1
 session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
-auth [success=1 default=ignore] pam_python.so /lib/security/libpam_arvados.py api.example shell.example noprompt
+auth [success=1 default=ignore] pam_python.so /usr/local/lib/security/libpam_arvados.py api.example shell.example noprompt
 auth   requisite                       pam_deny.so
 auth   required                        pam_permit.so
 

diff --git a/sdk/pam/pam-configs/arvados b/sdk/pam/pam-configs/arvados
index 6972a396a848faeba16c1f084999a0c2b8e7b9af..086e176d407dee866706afd1ab433fffdaaf4d66 100644 (file)
--- a/sdk/pam/pam-configs/arvados
+++ b/sdk/pam/pam-configs/arvados
@@ -9,6 +9,6 @@ Default: yes
 Priority: 256
 Auth-Type: Primary
 Auth:
-       [success=end default=ignore]    pam_python.so /lib/security/libpam_arvados.py api.example shell.example
+       [success=end default=ignore]    pam_python.so /usr/local/lib/security/libpam_arvados.py api.example shell.example
 Auth-Initial:
-       [success=end default=ignore]    pam_python.so /lib/security/libpam_arvados.py api.example shell.example
+       [success=end default=ignore]    pam_python.so /usr/local/lib/security/libpam_arvados.py api.example shell.example

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 208644ea6f307318334f8596a4073a6c1a114c57..49153884955465e4a1ac7d94f2c18f0e2f2a40e6 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -32,9 +32,9 @@ setup(name='arvados-pam',
       scripts=[
       ],
       data_files=[
-          ('/usr/share/pam-configs', ['pam-configs/arvados']),
-          ('/lib/security', ['lib/libpam_arvados.py']),
-          ('/usr/share/arvados-pam', ['examples/shellinabox']),
+          ('lib/security', ['lib/libpam_arvados.py']),
+          ('share/arvados-pam', ['examples/shellinabox']),
+          ('share/pam-configs', ['pam-configs/arvados']),
       ],
       install_requires=[
           'arvados-python-client>=0.1.20150801000000',