Merge branch 'master' of https://github.com/zevaverbach/personal_api

 Conflicts:

	docker-compose.yml

data/nginx/app.conf

@@ -0,0 +1,30 @@
+server {
+    listen 80;
+    server_name api.averba.ch;    location / {
+        return 301 https://$host$request_uri;
+    }    
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+}
+
+server {
+    listen 443 ssl;
+    server_name api.averba.ch;
+
+    ssl_certificate /etc/letsencrypt/live/api.averba.ch/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/api.averba.ch/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+    
+    location / {
+        proxy_pass http://personal-api:8000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_connect_timeout 300s;
+        proxy_read_timeout 300s;
+
+    }
+}

docker-compose.yml

@@ -1,9 +1,8 @@
 version: '3.7'
 services:
   nginx:
-    image: nginx:latest
     container_name: nginx
-    depends_on: app
+    image: nginx:latest
     ports:
       - "80:80"
       - "443:443"
@@ -27,9 +26,5 @@ services:
     volumes:
       - ./:/personal_api/
     command: gunicorn -w 4 -k uvicorn.workers.UvicornWorker personal_api.main:app -b 0.0.0.0
-    networks:
-      my-network:
-        aliases:
-          - personal-api
     ports:
       - "8000:8000"