diff --git a/dokku b/dokku index 3dd1f314c..d335e8508 100755 --- a/dokku +++ b/dokku @@ -41,7 +41,7 @@ if [[ "${args[0]}" =~ ^--.* ]]; then fi ! has_tty && DOKKU_QUIET_OUTPUT=1 -if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" ]]; then +if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" && $1 != nginx:*-logs ]]; then sudo -u dokku -E -H $0 "$@" exit fi diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index 3699f25f7..b965951ff 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -175,7 +175,7 @@ EOF NGINX_LOGS_ARGS="-n 20" fi - sudo tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH" + tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH" ;; help | nginx:help) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 674b00a87..c348c3b22 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -4,12 +4,10 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$DOKKU_DISTRO" in ubuntu) echo "%dokku ALL=(ALL) NOPASSWD:/etc/init.d/nginx reload, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx - echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/tail" >> /etc/sudoers.d/dokku-nginx ;; opensuse) echo "%dokku ALL=(ALL) NOPASSWD:/sbin/service nginx reload, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx - echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/tail" >> /etc/sudoers.d/dokku-nginx ;; esac