Merge branch 'release/1.0.30'

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Nginx-Craft Changelog
 
+## 1.0.30 - 2020.11.05
+### Added
+* Added support for (Forge Templates](https://forge.laravel.com/docs/1.0/servers/nginx-templates.html) via `forge-templates/NginxTemplate.conf`
+
 ## 1.0.29 - 2020.10.21
 ### Changed
 * Fix multi-site requests missing query params

forge-example/NginxConfiguration.conf renamed to forge-templates/NginxTemplate.conf

@@ -1,5 +1,5 @@
 # FORGE CONFIG (DO NOT REMOVE!)
-include forge-conf/SOMEDOMAIN.com/before/*;
+include forge-conf/{{ SITE }}/before/*;
 
 # Bots to ban via user agent
 map $http_user_agent $limit_bots {
@@ -13,9 +13,9 @@ server {
     listen [::]:443 ssl http2;
 
     # General virtual host settings
-    server_name SOMEDOMAIN.com;
+    server_name {{ SITE }};
     server_tokens off;
-    root /home/forge/SOMEDOMAIN.com/public;
+    root {{ PATH }};
     index index.html index.htm index.php;
     charset utf-8;
 
@@ -55,13 +55,13 @@ server {
 
     # Access and error logging
     access_log off;
-    error_log  /var/log/nginx/SOMEDOMAIN.com-error.log error;
+    error_log  /var/log/nginx/{{ SITE }}-error.log error;
     # If you want error logging to go to SYSLOG (for services like Papertrailapp.com), uncomment the following:
     #error_log syslog:server=unix:/dev/log,facility=local7,tag=nginx,severity=error;
 
     # FORGE SSL (DO NOT REMOVE!)
-    ssl_certificate /etc/nginx/ssl/SOMEDOMAIN.com/XXXXXX/server.crt;
-    ssl_certificate_key /etc/nginx/ssl/SOMEDOMAIN.com/XXXXXX/server.key;
+    ssl_certificate /etc/nginx/ssl/{{ SITE }}/XXXXXX/server.crt;
+    ssl_certificate_key /etc/nginx/ssl/{{ SITE }}/XXXXXX/server.key;
 
     # SSL/TLS configuration, with TLSv1.0 disabled because it is insecure; note that IE 8, 9 & 10 support
     # TLSv1.1, but it's not enabled by default clients using those browsers will not be able to connect
@@ -77,7 +77,7 @@ server {
     ssl_trusted_certificate /etc/nginx/ssl/lets-encrypt-x3-cross-signed.pem;
 
     # FORGE CONFIG (DO NOT REMOVE!)
-    include forge-conf/SOMEDOMAIN.com/server/*;
+    include forge-conf/{{ SITE }}/server/*;
 
     # Load configuration files from nginx-partials
     include /etc/nginx/nginx-partials/*.conf;
@@ -126,7 +126,7 @@ server {
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         fastcgi_param DOCUMENT_ROOT $realpath_root;
         fastcgi_param HTTP_PROXY "";
-        fastcgi_param HTTP_HOST SOMEDOMAIN.com;
+        fastcgi_param HTTP_HOST {{ SITE }};
 
         # Don't allow browser caching of dynamically generated content
         add_header Last-Modified $date_gmt;
@@ -156,4 +156,4 @@ server {
 }
 
 # FORGE CONFIG (DO NOT REMOVE!)
-include forge-conf/SOMEDOMAIN.com/after/*;
+include forge-conf/{{ SITE }}/after/*;