From 132cd59011f570cda40f32e6a71b7d3632622363 Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Sat, 9 May 2020 23:12:51 +0200
Subject: [PATCH] Update env vars and nginx conf for deployment

---
 .env.production                           | 3 ++-
 .env.staging                              | 2 ++
 ext/nginx.conf.d/production.conf.template | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.env.production b/.env.production
index 145a876..be5c321 100644
--- a/.env.production
+++ b/.env.production
@@ -18,10 +18,11 @@ PRODUCTION_ROOT_DOMAIN=ensl.org
 PRODUCTION_DOMAIN=www.ensl.org
 PRODUCTION_PORT=80
 PRODUCTION_PORT_SSL=443
+PRODUCTION_NGINX_PATH=/var/www
 
 MYSQL_DATABASE=ensl
 MYSQL_CONNECTION_POOL=48
 
 APP_DOMAIN=ensl.org
 
-GOOGLE_CALENDAR=enabled
\ No newline at end of file
+GOOGLE_CALENDAR=enabled
diff --git a/.env.staging b/.env.staging
index 60fd68d..75bbdf1 100644
--- a/.env.staging
+++ b/.env.staging
@@ -8,9 +8,11 @@ SCRYPT_MAX_TIME=0.001
 ASSETS_PRECOMPILE=1
 
 PUMA_PORT=5000
+
 STAGING_ROOT_DOMAIN=ensl.org
 STAGING_DOMAIN=www.ensl.org
 STAGING_PORT=5001
 STAGING_PORT_SSL=5000
+STAGING_NGINX_PATH=/var/staging
 
 MYSQL_DATABASE=ensl_staging
diff --git a/ext/nginx.conf.d/production.conf.template b/ext/nginx.conf.d/production.conf.template
index 43ca6de..c0c138c 100644
--- a/ext/nginx.conf.d/production.conf.template
+++ b/ext/nginx.conf.d/production.conf.template
@@ -3,7 +3,7 @@
 # Use it in production or copy it over
 
 upstream puma {
-  server production:$PUMA_PORT;
+  server production:$PRODUCTION_PUMA_PORT;
   # server unix:/var/tmp/puma.$RAILS_ENV.sock fail_timeout=0;
 }
 
@@ -17,7 +17,7 @@ server {
   ssl_certificate_key /etc/ssl/ensl/privkey.pem;
 
   server_name $PRODUCTION_ROOT_DOMAIN;
-  root $APP_PATH_PUBLIC;
+  root $PRODUCTION_NGINX_PUBLIC;
   return 301 https://$PRODUCTION_DOMAIN$request_uri;
 }
 
@@ -36,7 +36,7 @@ server {
   error_page 497 https://$host:$server_port$request_uri;
 
   server_name $PRODUCTION_DOMAIN;
-  root $APP_PATH_PUBLIC;
+  root $PRODUCTION_NGINX_PUBLIC;
   index index.html index.htm index.php;
 
   ssl_certificate /etc/ssl/ensl/fullchain.pem;