github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4552 from dokku/letsencrypt-ssl-fixes

Browse Source 
Scope return 301 in nginx config to allow proper letsencrypt usage
This commit is contained in:
Jose Diaz-Gonzalez
2021-04-13 14:38:33 -04:00
committed by GitHub
parent 56324bc71e f4a0dca15b
commit 1668e4bc57
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/common/property-functions
View File

@@ -10,7 +10,7 @@ fn-plugin-property-get() {
} }
fn-plugin-property-clone() { 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" declare PLUGIN="$1" OLD_APP="$2" NEW_APP="$3"
"$PLUGIN_CORE_AVAILABLE_PATH/common/prop" "clone" "$PLUGIN" "$OLD_APP" "$NEW_APP" "$PLUGIN_CORE_AVAILABLE_PATH/common/prop" "clone" "$PLUGIN" "$OLD_APP" "$NEW_APP"
} }

5
plugins/nginx-vhosts/templates/nginx.conf.sigil
View File

@@ -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 }}; 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 }}; error_log {{ $.NGINX_ERROR_LOG_PATH }};
{{ if (and (eq $listen_port "80") ($.SSL_INUSE)) }} {{ 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 }} {{ else }}
location / { location / {

4
plugins/proxy/functions
View File

@@ -8,7 +8,7 @@ is_app_proxy_enabled() {
declare desc="return true if proxy is enabled; otherwise return false" declare desc="return true if proxy is enabled; otherwise return false"
declare APP="$1" declare APP="$1"
declare deprecated=true 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" plugn trigger proxy-is-enabled "$APP"
} }
@@ -17,7 +17,7 @@ get_app_proxy_type() {
declare desc="return app proxy type" declare desc="return app proxy type"
declare APP="$1" declare APP="$1"
declare deprecated=true declare deprecated=true
dokku_log_warn "Deprecated: plugn#proxy-type" dokku_log_warn "Deprecated: Use plugn#proxy-type"
plugn trigger proxy-type "$APP" plugn trigger proxy-type "$APP"
} }