diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/direct.conf b/tandoor_recipes/rootfs/etc/nginx/servers/direct.conf deleted file mode 100644 index 5dcb0921d..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/servers/direct.conf +++ /dev/null @@ -1,25 +0,0 @@ -server { - {{ if not .ssl }} - listen 80 default_server; - {{ else }} - listen 80 default_server ssl http2; - {{ end }} - - include /etc/nginx/includes/server_params.conf; - - {{ if .ssl }} - include /etc/nginx/includes/ssl_params.conf; - - ssl_certificate /ssl/{{ .certfile }}; - ssl_certificate_key /ssl/{{ .keyfile }}; - {{ end }} - - location ~ .php$ { - fastcgi_pass 127.0.0.1:9001; - fastcgi_read_timeout 900; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/includes/fastcgi_params.conf; - } -} diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf new file mode 100644 index 000000000..0ee7367f7 --- /dev/null +++ b/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf @@ -0,0 +1,22 @@ +server { + + listen 8080; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + ssl_certificate /ssl/%%certfile%%; + ssl_certificate_key /ssl/%%keyfile%%; + + location / { + # Proxy pass + proxy_pass http://127.0.0.1:8081; + + # Next three lines allow websockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + } + +}