From 18d6e1be3bf4d0dd3142eb197fe451f3f62b6885 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 24 Oct 2015 23:12:38 -0400 Subject: [PATCH] Add special case commands for instances where we are running dokku in debian Refs #976 --- docs/development/plugin-triggers.md | 5 +++-- plugins/00_dokku-standard/install | 2 +- plugins/nginx-vhosts/dependencies | 5 +++++ plugins/nginx-vhosts/functions | 4 ++++ plugins/nginx-vhosts/install | 8 ++++++++ plugins/nginx-vhosts/post-delete | 4 ++++ 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index b0e77bded..7b695f175 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -62,9 +62,10 @@ fi set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +export DEBIAN_FRONTEND=noninteractive + case "$DOKKU_DISTRO" in - ubuntu) - export DEBIAN_FRONTEND=noninteractive + debian|ubuntu) apt-get install --force-yes -qq -y nginx ;; diff --git a/plugins/00_dokku-standard/install b/plugins/00_dokku-standard/install index dc08fc7e1..818c27eb0 100755 --- a/plugins/00_dokku-standard/install +++ b/plugins/00_dokku-standard/install @@ -25,7 +25,7 @@ end script EOF ;; - opensuse) + debian|opensuse) cat< /etc/systemd/system/dokku-redeploy.service [Unit] Description=Dokku app redeploy service diff --git a/plugins/nginx-vhosts/dependencies b/plugins/nginx-vhosts/dependencies index eaac64887..2ce7e4e7f 100755 --- a/plugins/nginx-vhosts/dependencies +++ b/plugins/nginx-vhosts/dependencies @@ -2,6 +2,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$DOKKU_DISTRO" in + debian) + export DEBIAN_FRONTEND=noninteractive + apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils + ;; + ubuntu) export DEBIAN_FRONTEND=noninteractive [[ -z "$CIRCLECI" ]] && apt-get install -qq -y software-properties-common python-software-properties diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 8b4cb36a2..c8f1c1d40 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -114,6 +114,10 @@ validate_nginx() { restart_nginx() { case "$DOKKU_DISTRO" in + debian) + /usr/sbin/invoke-rc.d nginx reload > /dev/null + ;; + ubuntu) sudo /etc/init.d/nginx reload > /dev/null ;; diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index d4e751099..b7e508a48 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -2,6 +2,10 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$DOKKU_DISTRO" in + debian) + echo "%dokku ALL=(ALL) NOPASSWD:/usr/sbin/invoke-rc.d nginx reload, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx + ;; + ubuntu) echo "%dokku ALL=(ALL) NOPASSWD:/etc/init.d/nginx reload, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx ;; @@ -41,6 +45,10 @@ chmod g+r /var/log/nginx [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx case "$DOKKU_DISTRO" in + debian) + /usr/sbin/invoke-rc.d nginx start + ;; + ubuntu) /etc/init.d/nginx start ;; diff --git a/plugins/nginx-vhosts/post-delete b/plugins/nginx-vhosts/post-delete index ab0578794..c4e7b2b9e 100755 --- a/plugins/nginx-vhosts/post-delete +++ b/plugins/nginx-vhosts/post-delete @@ -2,6 +2,10 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$DOKKU_DISTRO" in + debian) + sudo /usr/sbin/invoke-rc.d nginx reload > /dev/null + ;; + ubuntu) sudo /etc/init.d/nginx reload > /dev/null ;;