From d18f68a15c49246c53aca4087dd9906b15041f44 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@pelo.tech>
Date: Sat, 26 Jan 2019 09:02:28 -0800
Subject: [PATCH] staging environment.

---
 datomic-init/postgres-db.sql | 2 +-
 deploy-staging.sh            | 2 +-
 docker-compose.prod.yml      | 2 +-
 docker-compose.staging.yml   | 8 ++++----
 docker-compose.yml           | 8 +-------
 terraform/staging.tfvars     | 2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/datomic-init/postgres-db.sql b/datomic-init/postgres-db.sql
index d449c8de..4a003a15 100755
--- a/datomic-init/postgres-db.sql
+++ b/datomic-init/postgres-db.sql
@@ -3,7 +3,7 @@
 -- DROP DATABASE datomic;
 
 CREATE DATABASE datomic
- WITH OWNER = postgres
+ WITH OWNER = ap
       TEMPLATE template0
       ENCODING = 'UTF8'
       TABLESPACE = pg_default
diff --git a/deploy-staging.sh b/deploy-staging.sh
index 7112c5f4..34b83f44 100755
--- a/deploy-staging.sh
+++ b/deploy-staging.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-eval $(docker-machine env aws01)
+eval $(docker-machine env aws02)
 docker-compose -f docker-compose.yml -f docker-compose.staging.yml -p staging up --build -d
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 41e2dbf7..cedf929d 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -27,7 +27,7 @@ services:
       config: /usr/local/config/prod.edn
       VIRTUAL_HOST: app.integreatconsult.com
       VIRTUAL_PORT: 3000
-      LETSENCRYPT_HOST: staging.app.integreatconsult.com,app.integreatconsult.com
+      LETSENCRYPT_HOST: app.integreatconsult.com
       LETSENCRYPT_EMAIL: le@brycecovertoperations.com
   database:
     restart: always
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 0eed57fb..7b2437b3 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -3,8 +3,8 @@ services:
   nginx-proxy:
     restart: "always"
     ports:
-      - "8080:80"
-      - "8443:443"
+      - "80:80"
+      - "443:443"
     labels:
       - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true
     volumes:
@@ -25,9 +25,9 @@ services:
     restart: always
     environment:
       config: /usr/local/config/staging.edn
-      VIRTUAL_HOST: staging.app.integreatconsult.com
+      VIRTUAL_HOST: staging2.app.integreatconsult.com
       VIRTUAL_PORT: 3000
-      LETSENCRYPT_HOST: staging.app.integreatconsult.com
+      LETSENCRYPT_HOST: staging2.app.integreatconsult.com
       LETSENCRYPT_EMAIL: le@brycecovertoperations.com
   database:
     restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 671f7391..5ac8b4dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,14 +33,8 @@ services:
       POSTGRES_DB: autoap
     volumes:
       - ./data/var/lib/postgresql/data:/var/lib/postgresql/data
-  migrator:
-    build: ./migrator
-    depends_on:
-      - database
-    environment:
-      DATABASE_URL: "postgresql://ap:fifteen-invoices-imported!@database/autoap?ssl=false"
   datomic-transactor:
-    image: 679918342773.dkr.ecr.us-east-1.amazonaws.com/datomic
+    image: 679918342773.dkr.ecr.us-east-1.amazonaws.com/datomic:latest
     environment:
       - DATOMIC_HOST=datomic-transactor
       - DATOMIC_PORT=4334
diff --git a/terraform/staging.tfvars b/terraform/staging.tfvars
index aae7d302..281b6952 100644
--- a/terraform/staging.tfvars
+++ b/terraform/staging.tfvars
@@ -2,5 +2,5 @@ aws_access_key_id="AKIAINHACMVQJ6NYD26A"
 aws_secret_access_key="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"
 domain="staging.app.integreatconsult.com"
 invoice_address="invoices-staging@mail.app.integreatconsult.com"
-base_url="https://staging.app.integreatconsult.com:8443"
+base_url="https://staging.app.integreatconsult.com"
 stage="staging"