Chore: change location rule in nginx conf (ToolJet#320)

* change location rule in nginx conf; enable std out logging * use packer variables to set ami name, instance type and ami region
nisusam · Jun 25, 2021 · 80d5ec5 · 80d5ec5
1 parent de76116
commit 80d5ec5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/deploy/ec2/.env b/deploy/ec2/.env
@@ -5,3 +5,4 @@ PG_DB=tooljet_prod
 PG_USER=<pg user name>
 PG_HOST=<pg host>
 PG_PASS=<pg user password>
+RAILS_LOG_TO_STDOUT=true
diff --git a/deploy/ec2/nginx.conf b/deploy/ec2/nginx.conf
@@ -58,7 +58,7 @@ http
     location /
     {
       root /home/ubuntu/app/frontend/build;
-      index index.html;
+      try_files $uri $uri/ /index.html;
     }
 
     location /_backend_
@@ -84,7 +84,7 @@ http
     location /
     {
       root /home/ubuntu/app/frontend/build;
-      index index.html;
+      try_files $uri $uri/ /index.html;
     }
 
     location /_backend_

diff --git a/deploy/ec2/tool_jet_ubuntu_bionic.pkr.hcl b/deploy/ec2/tool_jet_ubuntu_bionic.pkr.hcl
@@ -8,9 +8,9 @@ packer {
 }
 
 source "amazon-ebs" "ubuntu" {
-  ami_name      = "tooljet_latest_ubuntu_bionic"
-  instance_type = "t2.medium"
-  region        = "us-west-2"
+  ami_name      = "${var.ami_name}"
+  instance_type = "${var.instance_type}"
+  region        = "${var.ami_region}"
   source_ami_filter {
     filters = {
       name                = "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"

diff --git a/deploy/ec2/variables.pkr.hcl b/deploy/ec2/variables.pkr.hcl
@@ -0,0 +1,14 @@
+
+variable "ami_name" {
+  type =  string
+}
+
+variable "instance_type" {
+  type = string
+  default = "t2.medium"
+}
+
+variable "ami_region" {
+  type = string
+  default = "us-west-2"
+}