From 78d2b3e7d2c94072fec84d4a6adabfb6eed5441f Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 16 May 2016 12:45:37 -0700 Subject: [PATCH] attempt to bypass inconsistencies in nginx start behavior. closes #2197 --- plugins/nginx-vhosts/install | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 2c5dfea9e..0308d5e5f 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -49,18 +49,24 @@ gpasswd -M "" dokku case "$DOKKU_DISTRO" in debian) - /usr/sbin/invoke-rc.d nginx start + NGINX_INIT="/usr/sbin/invoke-rc.d" + "$NGINX_INIT" nginx start || "$NGINX_INIT" nginx reload ;; ubuntu) - /etc/init.d/nginx start + NGINX_INIT="/etc/init.d/nginx" + "$NGINX_INIT" start || "$NGINX_INIT" reload ;; opensuse) - /sbin/service nginx start + NGINX_INIT="/sbin/service" + "$NGINX_INIT" nginx start || "$NGINX_INIT" nginx reload ;; arch) - /usr/bin/systemctl start nginx + NGINX_INIT="/usr/bin/systemctl" + "$NGINX_INIT" start nginx || "$NGINX_INIT" reload nginx ;; esac + +