fix broken tar/urls tests

This commit is contained in:
Michael Hobbs
2016-06-15 16:22:45 -07:00
parent ff18e0d6be
commit ab94a9fc67
3 changed files with 13 additions and 14 deletions

View File

@@ -11,8 +11,7 @@ server {
{{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }}
access_log /var/log/nginx/{{ $.APP }}-access.log;
error_log /var/log/nginx/{{ $.APP }}-error.log;
{{ if $.SSL_INUSE }}
{{ if eq $listen_port "80" }}
{{ if (and (eq $listen_port "80") ($.SSL_INUSE)) }}
return 301 https://$host:{{ $.NGINX_SSL_PORT }}$request_uri;
{{ else }}
location / {
@@ -35,7 +34,7 @@ server {
proxy_set_header X-Request-Start $msec;
}
include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
{{ end }}{{ end }}
{{ end }}
}
{{ else if eq $scheme "https"}}
server {