Merge branch '8018-container-retry' closes #8018

[arvados.git] / sdk / pam / setup.py

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index d261cebf410086694a0d2a0d1931726c6eca1631..e1046ac9c75c8f3368cde784fac38bfa3feab7bf 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import glob
 import os
 import sys
 import setuptools.command.egg_info as egg_info_cmd
@@ -33,8 +34,16 @@ setup(name='arvados-pam',
       ],
       data_files=[
           ('lib/security', ['lib/libpam_arvados.py']),
-          ('share/arvados-pam', ['examples/shellinabox']),
           ('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',