[ARVADOS] updated: 9a3fd168b3819c2682960193606110fdddffcb97
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 10 14:31:14 EDT 2015
Summary of changes:
sdk/pam/.dockerignore | 2 --
sdk/pam/Dockerfile | 15 ++++++++++-----
sdk/pam/MANIFEST.in | 2 ++
sdk/pam/fpm-info.sh | 17 +++++++++++++++++
sdk/pam/lib/libpam_arvados.py | 1 +
.../pam-auth-update_arvados => pam-configs/arvados} | 7 +++++--
sdk/pam/setup.py | 7 +++++--
sdk/python/fpm-info.sh | 5 +++++
services/nodemanager/bin/arvados-node-manager | 0
9 files changed, 45 insertions(+), 11 deletions(-)
create mode 100644 sdk/pam/fpm-info.sh
create mode 100644 sdk/pam/lib/libpam_arvados.py
rename sdk/pam/{examples/pam-auth-update_arvados => pam-configs/arvados} (59%)
create mode 100644 sdk/python/fpm-info.sh
mode change 100644 => 100755 services/nodemanager/bin/arvados-node-manager
via 9a3fd168b3819c2682960193606110fdddffcb97 (commit)
via df53e3b05b0a8b740ded67e4bd87763cec8c30d4 (commit)
from 132bbb69970640e2906bc1285bee9709accb3fc7 (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 9a3fd168b3819c2682960193606110fdddffcb97
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Aug 10 11:41:46 2015 -0400
6934: Fixup packaging
diff --git a/sdk/pam/.dockerignore b/sdk/pam/.dockerignore
index d6778dc..86ec754 100644
--- a/sdk/pam/.dockerignore
+++ b/sdk/pam/.dockerignore
@@ -3,6 +3,4 @@
.eggs
*.egg_info
build
-debian
-dist
tmp
diff --git a/sdk/pam/Dockerfile b/sdk/pam/Dockerfile
index 7c45607..c5e83f8 100644
--- a/sdk/pam/Dockerfile
+++ b/sdk/pam/Dockerfile
@@ -1,3 +1,11 @@
+# Manual integration test:
+# 0. python setup.py sdist rotate --keep=1 --match .tar.gz
+# 1. docker build -name arvados:pam_test .
+# 2. docker run -it arvados:pam_test
+# 3. container# edit /etc/pam.d/login # set api host and shell VM name
+# 4. container# useradd testusername
+# 5. container# login # enter username and token
+
FROM debian:wheezy
RUN apt-get update
RUN apt-get -qy dist-upgrade
@@ -6,10 +14,7 @@ RUN apt-get -qy install python python-virtualenv libpam-python rsyslog
RUN apt-get -qy install libcurl4-gnutls-dev python2.7-dev
RUN pip install --upgrade setuptools
RUN pip install python-pam
-ADD . /pam
-WORKDIR /pam
-RUN ./setup.py sdist
-RUN pip install dist/arvados-pam-*.tar.gz
-COPY examples/pam-auth-update_arvados /usr/share/pam-configs/arvados
+ADD dist /dist
+RUN pip install /dist/arvados-pam-*.tar.gz
RUN DEBIAN_FRONTEND=noninteractive pam-auth-update arvados --remove unix
CMD rsyslogd & tail -F /var/log/auth.log & bash
diff --git a/sdk/pam/MANIFEST.in b/sdk/pam/MANIFEST.in
index 9561fb1..39211b3 100644
--- a/sdk/pam/MANIFEST.in
+++ b/sdk/pam/MANIFEST.in
@@ -1 +1,3 @@
include README.rst
+include lib/libpam_arvados.py
+include pam-configs/arvados
diff --git a/sdk/pam/lib/libpam_arvados.py b/sdk/pam/lib/libpam_arvados.py
new file mode 100644
index 0000000..deead7e
--- /dev/null
+++ b/sdk/pam/lib/libpam_arvados.py
@@ -0,0 +1 @@
+from arvados_pam import *
diff --git a/sdk/pam/pam-auth-update/arvados b/sdk/pam/pam-configs/arvados
similarity index 100%
rename from sdk/pam/pam-auth-update/arvados
rename to sdk/pam/pam-configs/arvados
diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 80f8241..7ab4521 100755
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -31,6 +31,10 @@ setup(name='arvados-pam',
],
scripts=[
],
+ data_files=[
+ ('/usr/share/pam-configs', ['pam-configs/arvados']),
+ ('/lib/security', ['lib/libpam_arvados.py']),
+ ],
install_requires=[
'arvados-python-client>=0.1.20150801000000',
],
commit df53e3b05b0a8b740ded67e4bd87763cec8c30d4
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Aug 10 10:42:17 2015 -0400
6934: Add packaging instructions
diff --git a/sdk/pam/fpm-info.sh b/sdk/pam/fpm-info.sh
new file mode 100644
index 0000000..4a81571
--- /dev/null
+++ b/sdk/pam/fpm-info.sh
@@ -0,0 +1,17 @@
+case "$TARGET" in
+ debian* | ubuntu*)
+ fpm_depends+=('libpam-python')
+ ;;
+ *)
+ echo >&2 "ERROR: $PACKAGE: pam_python.so dependency unavailable in $TARGET."
+ return 1
+ ;;
+esac
+
+case "$FORMAT" in
+ deb)
+ fpm_args+=('--deb-recommends=rsyslog')
+ ;;
+esac
+
+fpm_args+=('--config-files=examples/pam-auth-update_arvados')
diff --git a/sdk/pam/examples/pam-auth-update_arvados b/sdk/pam/pam-auth-update/arvados
similarity index 59%
rename from sdk/pam/examples/pam-auth-update_arvados
rename to sdk/pam/pam-auth-update/arvados
index eb58694..3d245f0 100644
--- a/sdk/pam/examples/pam-auth-update_arvados
+++ b/sdk/pam/pam-auth-update/arvados
@@ -1,5 +1,8 @@
-# 1. Install in /usr/share/pam-configs/arvados
-# 2. Run `pam-auth-update arvados`
+# 1. Change "api.example" to your ARVADOS_API_HOST
+# 2. Change "shell.example" to this host's hostname
+# (as it appears in the Arvados virtual_machines list)
+# 3. Install in /usr/share/pam-configs/arvados
+# 4. Run `pam-auth-update arvados`
Name: Arvados authentication
Default: yes
diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index f8a0c62..80f8241 100755
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -13,8 +13,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
try:
import gittaggers
- if subprocess.check_call(['git', 'log', '-n1']):
- tagger = gittaggers.EggInfoFromGit
+ tagger = gittaggers.EggInfoFromGit
except (ImportError, OSError):
pass
diff --git a/sdk/python/fpm-info.sh b/sdk/python/fpm-info.sh
new file mode 100644
index 0000000..1ab589d
--- /dev/null
+++ b/sdk/python/fpm-info.sh
@@ -0,0 +1,5 @@
+case "$TARGET" in
+ *)
+ fpm_depends+=('libcurl4-gnutls-dev')
+ ;;
+esac
diff --git a/services/nodemanager/bin/arvados-node-manager b/services/nodemanager/bin/arvados-node-manager
old mode 100644
new mode 100755
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list