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@curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index df551455c12dc8890a326f38b2e86f4b93adb4db..bd150e6a9b36ae96ed57792f2c7f79c51d21fcae 100755 (executable)
--- 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 37ed4b86ab9ca58a5fbd7a95632204069d39100d..3d695bf96b7d5caf01d2b12d1636b8aacc7ed048 100644 (file)
--- 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