Merge branch 'release/1.0.33'

nystudio107 · Mar 17, 2021 · 5008e4c · 5008e4c
2 parents fac1e06 + 09ddac0
commit 5008e4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Nginx-Craft Changelog
 
+## 1.0.33 - 2021.03.17
+### Changed
+* Updated the Forge template to use more Forge-provided variables
+
 ## 1.0.32 - 2021.02.08
 ### Changed
 * Changed the include path from `/etc/nginx` to `/home/forge` for the Forge config

diff --git a/forge-templates/NginxTemplate.conf b/forge-templates/NginxTemplate.conf
@@ -9,11 +9,11 @@ map $http_user_agent $limit_bots {
 
 server {
     # Listen for both IPv4 & IPv6 requests on port 443 with http2 enabled
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen {{ PORT }};
+    listen {{ PORT_V6 }};
 
     # General virtual host settings
-    server_name {{ SITE }};
+    server_name {{ DOMAINS }};
     server_tokens off;
     root {{ PATH }};
     index index.html index.htm index.php;
@@ -121,7 +121,7 @@ server {
         try_files $uri $uri/ /index.php?$query_string;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         # Change this to whatever version of php you are using
-        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
+        fastcgi_pass {{ PROXY_PASS }};
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param PATH_INFO $fastcgi_path_info;