From b0c577ddd7cc73adfa1603841927e01a7935817e Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 27 Feb 2017 22:41:42 +0900 Subject: [PATCH 1/4] Update command in example --- plugins/apps/internal-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/apps/internal-functions b/plugins/apps/internal-functions index 274132560..4de6de77e 100755 --- a/plugins/apps/internal-functions +++ b/plugins/apps/internal-functions @@ -23,7 +23,7 @@ apps_help_cmd() { echo '' echo 'Example:' echo '' - echo '$ dokku apps' + echo '$ dokku apps:list' echo '=====> My Apps' echo 'example' echo 'example2' From c1cef4f99ebd8d2cd18329c58a99f6ab875b8598 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Mon, 27 Feb 2017 23:04:54 +0900 Subject: [PATCH 2/4] Fix `certs:help` `certs` requires `app` argument like `certs:info`. --- plugins/certs/internal-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/certs/internal-functions b/plugins/certs/internal-functions index a7a38179f..77f4f0c79 100755 --- a/plugins/certs/internal-functions +++ b/plugins/certs/internal-functions @@ -6,7 +6,7 @@ source "$PLUGIN_AVAILABLE_PATH/certs/functions" certs_help_content_func() { declare desc="return certs plugin help content" cat<, [DEPRECATED] Alternative for certs:report certs:add CRT KEY, Add an ssl endpoint to an app. Can also import from a tarball on stdin certs:chain CRT [CRT ...], [NOT IMPLEMENTED] Print the ordered and complete chain for the given certificate certs:generate DOMAIN, Generate a key and certificate signing request (and self-signed certificate) From d79a79084eaceeff12e0137e413ef54deab03ccc Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 27 Feb 2017 07:30:21 -0700 Subject: [PATCH 3/4] fix: bail early when checking ps output for an undeployed app Closes #2630 --- plugins/ps/subcommands/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ps/subcommands/default b/plugins/ps/subcommands/default index 46dec800a..bcb52434d 100755 --- a/plugins/ps/subcommands/default +++ b/plugins/ps/subcommands/default @@ -8,10 +8,10 @@ ps_main_cmd() { [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on" local APP="$2"; verify_app_name "$APP" - local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP") - ! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0 + local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP") + local CID for CID in $DOKKU_APP_RUNNING_CONTAINER_IDS; do has_tty && local DOKKU_RUN_OPTS="-i -t" From f7a25eb4808321895bb0908c1d3483bfb5bb1951 Mon Sep 17 00:00:00 2001 From: David Poggi Date: Tue, 28 Feb 2017 13:20:47 -0500 Subject: [PATCH 4/4] update ssl.md Make sure we're respecting the respectively ;) --- docs/configuration/ssl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/ssl.md b/docs/configuration/ssl.md index 4c9b25e8f..6d59f6090 100644 --- a/docs/configuration/ssl.md +++ b/docs/configuration/ssl.md @@ -119,7 +119,7 @@ Beware that if you enable the header and a subsequent deploy of your application ## Running behind a load balancer -Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-For` and `X-Forwarded-Port`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers. +Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-Port` and `X-Forwarded-For`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers. If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/dokku/configuration/nginx/#customizing-the-nginx-configuration)