From ff18e0d6be2b4b226cc2bcd355dee16f50b235ee Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshobbs@users.noreply.github.com>
Date: Wed, 15 Jun 2016 12:40:05 -0700
Subject: [PATCH] cleanup external references to nginx-vhosts plugin

---
 plugins/00_dokku-standard/subcommands/deploy  | 2 +-
 plugins/00_dokku-standard/subcommands/version | 4 ----
 plugins/certs/subcommands/add                 | 1 -
 plugins/certs/subcommands/generate            | 3 +--
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/plugins/00_dokku-standard/subcommands/deploy b/plugins/00_dokku-standard/subcommands/deploy
index f2706b575..68f1a2252 100755
--- a/plugins/00_dokku-standard/subcommands/deploy
+++ b/plugins/00_dokku-standard/subcommands/deploy
@@ -102,7 +102,7 @@ dokku_deploy_cmd() {
         kill -9 $$
       }
 
-      # run checks first, then post-deploy hooks, which switches Nginx traffic
+      # run checks first, then post-deploy hooks, which switches proxy traffic
       trap 'kill_new $id' INT TERM EXIT
       if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "false" ]]; then
         dokku_log_info1 "Attempting pre-flight checks"
diff --git a/plugins/00_dokku-standard/subcommands/version b/plugins/00_dokku-standard/subcommands/version
index 99d2c89d1..c151f94c8 100755
--- a/plugins/00_dokku-standard/subcommands/version
+++ b/plugins/00_dokku-standard/subcommands/version
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/checks/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/proxy/functions"
 
 dokku_version_cmd() {
   declare desc="prints dokku version"
diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add
index 948f8b387..04324b4de 100755
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -2,7 +2,6 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/certs/functions"
-source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
 
 is_tar_import() {
   declare desc="determines if we have STDIN open in an attempt to detect a streamed tar import"
diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate
index 8bec9120c..daa2caed8 100755
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -2,7 +2,6 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"
-source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
 
 certs_generate_cmd() {
   declare desc="generates a self-signed SSL certificate/key combo"
@@ -26,7 +25,7 @@ certs_generate_cmd() {
     mv -f "$CERTS_GENERATE_TMP_WORK_DIR/server.key" "$CERTS_GENERATE_TMP_WORK_DIR/server.crt" "$APP_SSL_PATH"
     chmod 750 "$APP_SSL_PATH"
     chmod 640 "$APP_SSL_PATH/server.key" "$APP_SSL_PATH/server.crt"
-    [[ -n "$DOMAIN" ]] && (domains_add "$APP" "$DOMAIN" || nginx_build_config "$APP")
+    [[ -n "$DOMAIN" ]] && (domains_add "$APP" "$DOMAIN" || plugn trigger post-domains-update "$APP")
     dokku_log_info1 "The following is a certificate signing request that can be used"
     dokku_log_info1 "to generate an 'officially' signed SSL certificate for $APP at $DOMAIN"
     dokku_log_info1 "by a CA of your choosing."