[ARVADOS] updated: 75bbb895da9e69439da97de8e10266930616b708

[git at public.curoverse.com]

Summary of changes:
 sdk/pam/MANIFEST.in          | 1 +
 sdk/pam/examples/shellinabox | 2 +-
 sdk/pam/pam-configs/arvados  | 4 ++--
 sdk/pam/setup.py             | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

       via  75bbb895da9e69439da97de8e10266930616b708 (commit)
      from  1f0466a3493bd4a04d4164925c0255c28ad0f937 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 75bbb895da9e69439da97de8e10266930616b708
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 14 22:25:45 2015 -0400

    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 39211b3..c17568c 100644
--- 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 3f5fe62..2d91ccb 100644
--- 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 6972a39..086e176 100644
--- 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 208644e..4915388 100755
--- 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',

-----------------------------------------------------------------------


hooks/post-receive
--