[ARVADOS-DEV] updated: 06dd898fe349cbc5a16fb5f6daf2b563fbb3c936

git at public.curoverse.com git at public.curoverse.com
Thu Aug 20 11:21:23 EDT 2015


Summary of changes:
 jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh | 2 +-
 jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  06dd898fe349cbc5a16fb5f6daf2b563fbb3c936 (commit)
      from  81b4b70978fe97e6bd22bcb85cdfa36131f2f012 (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 06dd898fe349cbc5a16fb5f6daf2b563fbb3c936
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Aug 20 11:20:54 2015 -0400

    6940: Use nginx as WWW_OWNER on Red Hat distributions.
    
    We recommend deploying with Nginx, and this script interacts with
    Nginx.  The default Nginx configuration that Phusion ships runs as the
    nginx user on these distros.  Use that as the WWW_OWNER.
    
    Ideally we want to move to a more sophisticated place where we
    introspect the Web server configuration and use the same server it
    does.  But for now, this is an improvement.
    
    No issue #, but discovered when working on #6940.  I cleared this with
    Ward.

diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
index 5160c7a..cbd35d9 100755
--- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
+++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -e /etc/redhat-release ]; then
-    WWW_OWNER=apache:apache
+    WWW_OWNER=nginx:nginx
 else
     # Assume we're on a Debian-based system for now.
     WWW_OWNER=www-data:www-data
diff --git a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
index 0a2bf96..45eca77 100755
--- a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
+++ b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -e /etc/redhat-release ]; then
-    WWW_OWNER=apache:apache
+    WWW_OWNER=nginx:nginx
 else
     # Assume we're on a Debian-based system for now.
     WWW_OWNER=www-data:www-data

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list