From 61e154899b2ed94205ef3e4cd0a99ae1396c6bc8 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Wed, 14 Jan 2015 15:25:53 -0800 Subject: [PATCH] use ps:restart for config and domains plugins --- plugins/config/commands | 15 +-------------- plugins/domains/commands | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/plugins/config/commands b/plugins/config/commands index bb46313e2..f6d73e017 100755 --- a/plugins/config/commands +++ b/plugins/config/commands @@ -35,26 +35,13 @@ config_styled_hash () { done <<< "$vars" } -config_restart_app() { - APP="$1"; - - if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then - echo "-----> Releasing $APP ..." - dokku release $APP - echo "-----> Release complete!" - echo "-----> Deploying $APP ..." - dokku deploy $APP - echo "-----> Deploy complete!" - fi -} - config_write() { ENV_TEMP="$1" echo -e "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP if ! cmp -s $ENV_FILE $ENV_FILE_TEMP; then cp -f $ENV_FILE_TEMP $ENV_FILE chmod 600 $ENV_FILE - config_restart_app $APP + dokku ps:restart $APP fi rm -f $ENV_FILE_TEMP } diff --git a/plugins/domains/commands b/plugins/domains/commands index e3a9825f6..97f8569cb 100755 --- a/plugins/domains/commands +++ b/plugins/domains/commands @@ -16,19 +16,6 @@ RE_IPV6="${RE_IPV6}fe08:(:[0-9a-fA-F]{1,4}){2,2}%[0-9a-zA-Z]{1,}|" # TEST: f RE_IPV6="${RE_IPV6}::(ffff(:0{1,4}){0,1}:){0,1}${RE_IPV4}|" # TEST: ::255.255.255.255 ::ffff:255.255.255.255 ::ffff:0:255.255.255.255 (IPv4-mapped IPv6 addresses and IPv4-translated addresses) RE_IPV6="${RE_IPV6}([0-9a-fA-F]{1,4}:){1,4}:${RE_IPV4}" # TEST: 2001:db8:3:4::192.0.2.33 64:ff9b::192.0.2.33 -domains_restart_app() { - APP="$1"; - - if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then - echo "-----> Releasing $APP ..." - dokku release $APP - echo "-----> Release complete!" - echo "-----> Deploying $APP ..." - dokku deploy $APP - echo "-----> Deploy complete!" - fi -} - case "$1" in domains) [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 @@ -92,7 +79,7 @@ case "$1" in dokku domains:setup $APP echo "$3" >> "$DOKKU_ROOT/$APP/VHOST" # we need to restart the app to make sure we're binding to the appropriate network interface - domains_restart_app $APP + dokku ps:restart $APP pluginhook post-domains-update $APP echo "-----> Added $3 to $APP"