From 0967dc2130ba96714224e27a23b610631ad61f11 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 13 Apr 2021 13:26:14 -0400
Subject: [PATCH 1/3] fix: update deprecation warnings

---
 plugins/proxy/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/proxy/functions b/plugins/proxy/functions
index ce7222fa6..910a7a22e 100755
--- a/plugins/proxy/functions
+++ b/plugins/proxy/functions
@@ -8,7 +8,7 @@ is_app_proxy_enabled() {
   declare desc="return true if proxy is enabled; otherwise return false"
   declare APP="$1"
   declare deprecated=true
-  dokku_log_warn "Deprecated: plugn#proxy-is-enabled"
+  dokku_log_warn "Deprecated: Use plugn#proxy-is-enabled"
 
   plugn trigger proxy-is-enabled "$APP"
 }
@@ -17,7 +17,7 @@ get_app_proxy_type() {
   declare desc="return app proxy type"
   declare APP="$1"
   declare deprecated=true
-  dokku_log_warn "Deprecated: plugn#proxy-type"
+  dokku_log_warn "Deprecated: Use plugn#proxy-type"
 
   plugn trigger proxy-type "$APP"
 }

From 45417753a22dda2eb7f5c75954e666016a9901ce Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 13 Apr 2021 13:26:23 -0400
Subject: [PATCH 2/3] fix: correct description

---
 plugins/common/property-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common/property-functions b/plugins/common/property-functions
index 8f20ad8b4..2c45dcfd5 100755
--- a/plugins/common/property-functions
+++ b/plugins/common/property-functions
@@ -10,7 +10,7 @@ fn-plugin-property-get() {
 }
 
 fn-plugin-property-clone() {
-  declare desc="destroy the properties for an app"
+  declare desc="clone the properties for an app"
   declare PLUGIN="$1" OLD_APP="$2" NEW_APP="$3"
   "$PLUGIN_CORE_AVAILABLE_PATH/common/prop" "clone" "$PLUGIN" "$OLD_APP" "$NEW_APP"
 }

From f4a0dca15b919a9d53379e6bc1f45d547fee6dea Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 13 Apr 2021 13:26:49 -0400
Subject: [PATCH 3/3] fix: scope return 301 in nginx config to allow proper
 letsencrypt usage

---
 plugins/nginx-vhosts/templates/nginx.conf.sigil | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil
index 331bd5677..803878c6f 100644
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -12,7 +12,10 @@ server {
   access_log  {{ $.NGINX_ACCESS_LOG_PATH }}{{ if and ($.NGINX_ACCESS_LOG_FORMAT) (ne $.NGINX_ACCESS_LOG_PATH "off") }} {{ $.NGINX_ACCESS_LOG_FORMAT }}{{ end }};
   error_log   {{ $.NGINX_ERROR_LOG_PATH }};
 {{ if (and (eq $listen_port "80") ($.SSL_INUSE)) }}
-  return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri;
+  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
+  location / {
+    return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri;
+  }
 {{ else }}
   location    / {