diff --git a/.gitignore b/.gitignore index 8a43bdae7..a3f92f4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -124,5 +124,8 @@ public/dist/* !public/dist/path.js !public/dist/README.md +public/js +public/css + # docker override is now untracked as of v10.3.0 docker/docker-compose.override.yml diff --git a/docker/config/nginx/nginx-nondev.conf b/docker/config/nginx/nginx-nondev.conf index d33421bbb..ea89a67a6 100644 --- a/docker/config/nginx/nginx-nondev.conf +++ b/docker/config/nginx/nginx-nondev.conf @@ -131,6 +131,8 @@ http { fastcgi_pass app:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param X-Forwarded-Proto $scheme; + fastcgi_param HTTPS on; include fastcgi_params; }