cleanup

sdss · Feb 22, 2024 · 20eedec · 20eedec
1 parent 4ec2585
commit 20eedec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 69 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -21,17 +21,6 @@ services:
     networks:
      - backend
 
-  # db:
-  #   image: postgres:latest
-  #   volumes:
-  #     - ./dbdata/:/var/lib/postgresql/data
-  #   environment:
-  #     POSTGRES_DB: manga
-  #     POSTGRES_USER: ${MANGADB_USER}
-  #     POSTGRES_PASSWORD: ${MANGADB_PASS}
-  #   networks:
-  #     - backend
-
   marvin:
     container_name: marvin
     build:
@@ -56,8 +45,6 @@ services:
       - frontend
     depends_on:
       - redis
-      #- db
-
 
 networks:
   backend:

diff --git a/docker/nginx.conf b/docker/nginx.conf
@@ -10,54 +10,19 @@ http {
     tcp_nopush on;
     tcp_nodelay on;
     keepalive_timeout 65;
-    # gzip on;
-    # gzip_disable "msie6";
+    gzip on;
 
-    #error_log /etc/nginx/nginx-error.log warn;
-    #access_log /etc/nginx/nginx-access.log;
+    error_log /tmp/marvin/nginx-error.log warn;
+    access_log /tmp/marvin/nginx-access.log;
 
     client_max_body_size 20m;
 
-    #proxy_cache_path /etc/nginx/cache keys_zone=one:500m max_size=1000m;
-
-    # upstream marvin {
-    #     server unix:/tmp/marvin/marvin.sock;
-    #     server 127.0.0.1:8000;
-    # }
-
-    # types {
-    #     text/html html htm;
-    #     text/css css;
-    #     application/javascript js;
-    #     image/jpeg jpg;
-    #     image/png png;
-    # }
-
     server {
         listen 80 default_server;
         server_name localhost;
 
-        # location /marvin {
-        #     proxy_set_header Host $http_host;
-        #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #     proxy_set_header X-Forwarded-Proto $scheme;
-        #     #proxy_redirect off;
-        #     #proxy_buffering off;
-        #     proxy_pass http://marvin:8000;
-        #     #proxy_cache one;
-        #     #proxy_http_version 1.1;
-
-        #     #add_header 'Access-Control-Allow-Origin' '*';  # Adjust this as needed
-        #     #add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';  # Adjust this as needed
-        #     #add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';  # Adjust this as needed
-
-        #     # error_log  /etc/nginx/marvin_error.log  error;
-        #     # access_log  /etc/nginx/marvin_access.log;
-        # }
-
         location / {
             proxy_pass http://marvin:8000/;
-            #rewrite ^/marvin(/.*)$ $1 break;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -68,31 +33,16 @@ http {
 
         location /api/ {
             proxy_pass http://marvin:8000/;
-            #rewrite ^/marvin(/.*)$ $1 break;
             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;
             proxy_redirect off;
             proxy_buffering off;
-        }
-        # location /marvin/api {
-        #     proxy_set_header Host $http_host;
-        #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #     proxy_set_header X-Forwarded-Proto $scheme;
-        #     #proxy_redirect off;
-        #     #proxy_buffering off;
-        #     proxy_pass http://marvin:8000;
-        #     #proxy_cache one;
-        #     #proxy_http_version 1.1;
 
-        #     #add_header 'Access-Control-Allow-Origin' '*';  # Adjust this as needed
-        #     #add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';  # Adjust this as needed
-        #     #add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';  # Adjust this as needed
-
-        #     # error_log  /etc/nginx/marvin_api_error.log  error;
-        #     # access_log  /etc/nginx/marvin_api_access.log;
-        # }
+            error_log  /tmp/marvin/logs/marvin_api_error.log  error;
+            access_log  /tmp/marvin/logs/marvin_api_access.log;
+        }
 
         location /marvin/static/ {
             alias /usr/share/nginx/html/static/;