[ARVADOS-DEV] updated: 623af8e46e921f59abeeee9e7ae8ec4aef890b5b

[Git user]

Summary of changes:
 jenkins/rails-package-scripts/postinst.sh | 8 +++++---
 jenkins/rails-package-scripts/postrm.sh   | 2 +-
 jenkins/run-library.sh                    | 5 ++---
 3 files changed, 8 insertions(+), 7 deletions(-)

       via  623af8e46e921f59abeeee9e7ae8ec4aef890b5b (commit)
       via  f0a79eeed911157a9095b04e34e7da79c45d4340 (commit)
       via  8a067f3805be65efd9200a8d772cc4301707dcb0 (commit)
       via  3c7848724d18912317d3198192004cc2fceeaa3f (commit)
       via  acab2f7c338f245baa7e5d9dca57476d12d863bf (commit)
      from  ec60d7fd235835947efd8dba97213015d37b036a (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 623af8e46e921f59abeeee9e7ae8ec4aef890b5b
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Feb 29 12:45:39 2016 -0500

    8371, 8413: Bump Rails package iteration.
    
    Build these bug fixes into new packages.
    Closes #8371, #8413.

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 23ed383..02d8d0d 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -148,9 +148,8 @@ handle_rails_package() {
     local -a pos_args=("$srcdir/=$railsdir" "$pkgname" "Curoverse, Inc." dir
                        "$(cat "$version_file")")
     local license_arg="$license_path=$railsdir/$(basename "$license_path")"
-    # --iteration=3 accommodates the package scripts change from #8014.
-    # --iteration=4 accommodates the packaging changes (inclusion of vendor/cache) from #8008.
-    local -a switches=(--iteration=4
+    # --iteration=5 accommodates the package script bugfixes #8371 and #8413.
+    local -a switches=(--iteration=5
                        --after-install "$scripts_dir/postinst"
                        --before-remove "$scripts_dir/prerm"
                        --after-remove "$scripts_dir/postrm")

commit f0a79eeed911157a9095b04e34e7da79c45d4340
Merge: 3c78487 8a067f3
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Feb 29 12:43:38 2016 -0500

    Merge branch '8413-fix-rails-postinst-chgrp-wip'
    
    Refs #8413.  Closes #8475.


commit 8a067f3805be65efd9200a8d772cc4301707dcb0
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Feb 26 18:13:19 2016 -0500

    8413: Rails postinst doesn't chgrp root /etc/arvados.
    
    Non-sensitive Rails configuration files can be 0644 root:root.
    Porting those permissions is fine for the individual configuration
    file, but not the parent directory tree.  Don't change the group of
    the directory tree in this case.

diff --git a/jenkins/rails-package-scripts/postinst.sh b/jenkins/rails-package-scripts/postinst.sh
index 5ff2a9b..6fac26b 100644
--- a/jenkins/rails-package-scripts/postinst.sh
+++ b/jenkins/rails-package-scripts/postinst.sh
@@ -94,11 +94,13 @@ setup_conffile() {
         # If there's a config file in /var/www identical to the one in /etc,
         # overwrite it with a symlink after porting its permissions.
         elif cmp --quiet "$release_conffile" "$etc_conffile"; then
-            local ownership="$(stat -c "%U:%G" "$release_conffile")"
+            local ownership="$(stat -c "%u:%g" "$release_conffile")"
+            local owning_group="${ownership#*:}"
+            if [ 0 != "$owning_group" ]; then
+                chgrp "$owning_group" "$CONFIG_PATH" /etc/arvados
+            fi
             chown "$ownership" "$etc_conffile"
             chmod --reference="$release_conffile" "$etc_conffile"
-            chgrp "${ownership#*:}" "$CONFIG_PATH" /etc/arvados
-            chmod g+rx "$CONFIG_PATH" /etc/arvados
             ln --force -s "$etc_conffile" "$release_conffile"
         fi
     fi

commit 3c7848724d18912317d3198192004cc2fceeaa3f
Merge: ec60d7f acab2f7
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Feb 29 12:43:11 2016 -0500

    Merge branch '8371-centos-postrm-bugfix-wip'
    
    Refs #8371.  Closes #8476.


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


hooks/post-receive
--