6638: 6934: Fix up shellinabox example and add to package.

diff --git a/sdk/pam/examples/etc_pam.d_arvados-pam-test b/sdk/pam/examples/etc_pam.d_arvados-pam-test
deleted file mode 100644 (file)
index ddff8c7..0000000
--- a/sdk/pam/examples/etc_pam.d_arvados-pam-test
+++ /dev/null
@@ -1,3 +0,0 @@
-auth [success=1 default=ignore] pam_python.so /usr/local/lib/python2.7/dist-packages/arvados_pam/__init__.py abc.example testvm2.shell
-auth   requisite                       pam_deny.so
-auth   required                        pam_permit.so

diff --git a/sdk/pam/examples/etc_pam.d_shellinabox b/sdk/pam/examples/shellinabox
similarity index 75%
rename from sdk/pam/examples/etc_pam.d_shellinabox
rename to sdk/pam/examples/shellinabox
index 355a85f3bcc6ce7502b8a975386bb2b6247bd479..3f5fe62af18b47cbd76b9ae7293e40ac27a04681 100644 (file)
--- a/sdk/pam/examples/etc_pam.d_shellinabox
+++ b/sdk/pam/examples/shellinabox
@@ -1,4 +1,6 @@
-# Install in /etc/pam.d/shellinabox
+# This example is a stock debian "login" file with libpam_arvados
+# replacing pam_unix, and the "noprompt" option in use. It can be
+# installed as /etc/pam.d/shellinabox .
 
 auth       optional   pam_faildelay.so  delay=3000000
 auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
@@ -7,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 /usr/local/lib/python2.7/dist-packages/arvados_pam/__init__.py api.example shell.example noprompt
+auth [success=1 default=ignore] pam_python.so /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/fpm-info.sh b/sdk/pam/fpm-info.sh
index 0c259eaa3b7408fd2509957d530f313b8413fd8c..35f3d5ad6b6a6a67ea3c7d3b5b58d355a0f45f79 100644 (file)
--- a/sdk/pam/fpm-info.sh
+++ b/sdk/pam/fpm-info.sh
@@ -13,5 +13,3 @@ case "$FORMAT" in
         fpm_args+=('--deb-recommends=system-log-daemon')
         ;;
 esac
-
-fpm_args+=('--config-files=examples/pam-auth-update_arvados')

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