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 5160c7ac5fcf0bf3b37a2ae25f364adf2f0ee965..cbd35d91ae0cc315690726a861b0465a399d2792 100755 (executable)
--- 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 0a2bf96d41fb368ded82fce6d7eafb131ea9cbbf..45eca77c55abbd4cf012497c4e422c0577e57a84 100755 (executable)
--- 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