Merge branch origin/main into main via pull

gramcracker40 · May 3, 2023 · fb04bd3 · fb04bd3
2 parents ba27977 + c865b0c
commit fb04bd3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.flaskenv b/.flaskenv
@@ -9,4 +9,4 @@ POSTGRES_USER=adminadminSECURE!!!
 POSTGRES_PASSWORD=ThisIsProductionBaby!!
 POSTGRES_DB=greenwatch_production
 SECRET_KEY=317aed4a0352d37253f433dc475fa5e7e306de7ad657add546d34f4e7c8b046c
-SERVER_IP="40.112.52.52:5000"
+SERVER_IP="40.112.52.52:80"
diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile
@@ -1,4 +1,4 @@
 FROM nginx:1.23-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY default.conf /etc/nginx/conf.d
+COPY prod.conf /etc/nginx/conf.d
diff --git a/services/nginx/default.conf → services/nginx/prod.conf b/services/nginx/default.conf → services/nginx/prod.conf