[ARVADOS] updated: 1.3.0-3243-g5cefb12be

[Git user]

Summary of changes:
 build/run-library.sh        | 2 +-
 lib/pam/pam-configs-arvados | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

       via  5cefb12be01e9df6997f88696048ecb5d77d305e (commit)
      from  67d6cbddddda5fb295c23f31499e6a8316345493 (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 5cefb12be01e9df6997f88696048ecb5d77d305e
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Sep 29 17:53:53 2020 -0400

    libpam-arvados-go: do not put a file with comments in
    /usr/share/pam-configs, the `pam-auth-update` command does not take
    kindly to that. Put that file in the package documentation directory
    instead.
    
    refs #15348
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index df551455c..bd150e6a9 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -210,7 +210,7 @@ package_go_so() {
         "$WORKSPACE/apache-2.0.txt=/usr/share/doc/$pkg/apache-2.0.txt"
     )
     if [[ -e "$WORKSPACE/$src_path/pam-configs-arvados" ]]; then
-        fpmargs+=("$WORKSPACE/$src_path/pam-configs-arvados=/usr/share/pam-configs/arvados-go")
+        fpmargs+=("$WORKSPACE/$src_path/pam-configs-arvados=/usr/share/doc/$pkg/pam-configs-arvados-go")
     fi
     if [[ -e "$WORKSPACE/$src_path/README" ]]; then
         fpmargs+=("$WORKSPACE/$src_path/README=/usr/share/doc/$pkg/README")
diff --git a/lib/pam/pam-configs-arvados b/lib/pam/pam-configs-arvados
index 37ed4b86a..3d695bf96 100644
--- a/lib/pam/pam-configs-arvados
+++ b/lib/pam/pam-configs-arvados
@@ -2,11 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# This file is packaged as /usr/share/pam-configs/arvados-go; see build/run-library.sh
-
-# 1. Run `pam-auth-update` and choose Arvados authentication
-# 2. In /etc/pam.d/common-auth, change "api.example" to your ARVADOS_API_HOST
-# 3. In /etc/pam.d/common-auth, change "shell.example" to this host's hostname
+# 1. Copy the contents of this file *minus all comment lines* to /usr/share/pam-configs/arvados-go
+# 2. Run `pam-auth-update` and choose Arvados authentication
+# 3. In /etc/pam.d/common-auth, change "api.example" to your ARVADOS_API_HOST
+# 4. In /etc/pam.d/common-auth, change "shell.example" to this host's hostname
 #    (as it appears in the Arvados virtual_machines list)
 
 Name: Arvados authentication

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


hooks/post-receive
--