diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index a0ba50ebe33..5b6f4eb185e 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -172,10 +172,30 @@ EOF dokku nginx:build-config $APP ;; + nginx:access-logs|nginx:error-logs) + [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 + verify_app_name "$2" + APP="$2" + + NGINX_LOGS_TYPE=${1#nginx:} + NGINX_LOGS_TYPE=${NGINX_LOGS_TYPE%-logs} + NGINX_LOGS_PATH="/var/log/nginx/$APP-$NGINX_LOGS_TYPE.log" + + if [[ $3 == "-t" ]]; then + NGINX_LOGS_ARGS="-F" + else + NGINX_LOGS_ARGS="-n 20" + fi + + sudo tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH" + ;; + help | nginx:help) cat && cat<, Imports a tarball from stdin; should contain server.crt and server.key nginx:build-config , (Re)builds nginx config for given app + nginx:access-logs [-t], Show the nginx access logs for an application (-t follows) + nginx:error-logs [-t], Show the nginx error logs for an application (-t follows) EOF ;; diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index c348c3b22c9..674b00a870d 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -4,10 +4,12 @@ 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