Skip to content

Commit

Permalink
DEAR-98 add newest nginx.conf, and docker-compose.yml from server
Browse files Browse the repository at this point in the history
  • Loading branch information
smuefsmuef committed Jul 27, 2024
1 parent a7a474b commit 4d2ea3f
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 60 deletions.
26 changes: 19 additions & 7 deletions .github/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,42 @@
##docker-compose for server
## copy of the docker-compose file on the server
## backend, frontend, db, nginx

#version: '3.9'
#services:
#
#services:
# frontend:
# container_name: frontend
# image: ghcr.io/24fsiit16/dear-dev-frontend:latest
# environment:
# - NEXT_TRUST_HOST=true
# ports:
# - "3000:3000"
# env_file:
# - .env
# depends_on:
# - backend
#
# db:
# yappi_db:
# image: postgres:13
# container_name: postgres_db
# container_name: yappi_db
# environment:
# POSTGRES_USER: ${POSTGRES_USER}
# POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
# POSTGRES_DB: postgres
# ports:
# - "5432:5432"
# volumes:
# - postgres_data:/var/lib/postgresql/data
# env_file:
# - .env
#
# backend:
# container_name: backend
# image: ghcr.io/24fsiit16/dear-dev-backend:latest
# ports:
# - "8080:8080"
# env_file:
# - .env
# depends_on:
# - db
# - yappi_db
#
# nginx:
# container_name: nginx
Expand All @@ -40,5 +49,8 @@
# - frontend
# - backend
#
#
#volumes:
# postgres_data:
#

47 changes: 47 additions & 0 deletions .github/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# copy of the nginx setup on our server

# events {}
#
# http {
# server {
# listen 80;
# server_name yappi.ch www.yappi.ch;
#
# location / {
# proxy_pass http://frontend:3000;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
#
# location /api/ {
# proxy_pass http://frontend:3000;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
#
# location /v1/ {
# proxy_pass http://backend:8080;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
#
# location /auth/github/callback {
# proxy_pass http://frontend/;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
#
# }
# }
#
#
#
#
53 changes: 0 additions & 53 deletions .github/nginx.yml

This file was deleted.

0 comments on commit 4d2ea3f

Please sign in to comment.