#105: Update remaining vhost templates

joomlatools · Jun 26, 2019 · 4e9a830 · 4e9a830
1 parent e71a8cf
commit 4e9a830
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/bin/.files/vhosts/nginx.kodekit.conf b/bin/.files/vhosts/nginx.kodekit.conf
@@ -1,15 +1,15 @@
 server {
-    listen                *:%3$s;
+    listen                *:%http_port%;
 
-    server_name           %1$s.test www.%1$s.test %1$s.dev www.%1$s.dev;
+    server_name           %site%.test www.%site%.test %site%.dev www.%site%.dev;
 
     # Enable when using Varnish:
     # port_in_redirect off;
 
-    root   %2$s;
+    root   %root%;
 
-    access_log            /var/log/nginx/%1$s.access.log;
-    error_log             /var/log/nginx/%1$s.error.log;
+    access_log            /var/log/nginx/%site%.access.log;
+    error_log             /var/log/nginx/%site%.error.log;
 
     set $root              $document_root;
     set $application_root  $root/application;
@@ -59,7 +59,7 @@ server {
     location ~* ^/application/(.*)/public/index.php$ {
         try_files $uri = 404;
 
-        fastcgi_pass   %4$s;
+        fastcgi_pass   %php_fpm%;
         fastcgi_index  index.php;
         fastcgi_param  PATH_INFO $fastcgi_path_info;
         fastcgi_param  PATH_TRANSLATED $document_root$fastcgi_path_info;

diff --git a/bin/.files/vhosts/nginx.kodekit.ssl.conf b/bin/.files/vhosts/nginx.kodekit.ssl.conf
@@ -1,13 +1,13 @@
 server {
-    listen *:%3$s ssl;
-    server_name %1$s.test www.%1$s.test %1$s.dev www.%1$s.dev;
+    listen *:%ssl_port% ssl;
+    server_name %site%.test www.%site%.test %site%.dev www.%site%.dev;
 
-    access_log            /var/log/nginx/%1$s.access.log;
-    error_log             /var/log/nginx/%1$s.error.log;
+    access_log            /var/log/nginx/%site%.access.log;
+    error_log             /var/log/nginx/%site%.error.log;
 
     ssl on;
-    ssl_certificate           %5$s;
-    ssl_certificate_key       %6$s;
+    ssl_certificate           %certificate%;
+    ssl_certificate_key       %key%;
     ssl_session_cache         shared:SSL:10m;
     ssl_session_timeout       5m;
     ssl_protocols             TLSv1 TLSv1.1 TLSv1.2;
@@ -17,7 +17,7 @@ server {
     # Enable when using Varnish:
     # port_in_redirect off;
 
-    root   %2$s;
+    root   %root%;
 
     set $root              $document_root;
     set $application_root  $root/application;
@@ -67,7 +67,7 @@ server {
     location ~* ^/application/(.*)/public/index.php$ {
         try_files $uri = 404;
 
-        fastcgi_pass   %4$s;
+        fastcgi_pass   %php_fpm%;
         fastcgi_index  index.php;
         fastcgi_param  PATH_INFO $fastcgi_path_info;
         fastcgi_param  PATH_TRANSLATED $document_root$fastcgi_path_info;