Skip to content

Commit

Permalink
resolve user login issue, and docker confiuration issue (infiniflow#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinHuSh authored Feb 29, 2024
1 parent 98d3c3f commit 4873964
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 48 deletions.
4 changes: 3 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ services:
volumes:
- ./service_conf.yaml:/ragflow/conf/service_conf.yaml
- ./ragflow-logs:/ragflow/logs
- ./nginx.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
networks:
- ragflow
restart: always
Expand Down
4 changes: 3 additions & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ function task_bro(){
task_bro &
task_exe &

$PY api/ragflow_server.py
$PY api/ragflow_server.py

wait;
46 changes: 0 additions & 46 deletions docker/nginx.conf

This file was deleted.

33 changes: 33 additions & 0 deletions docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
user root;
worker_processes auto;

error_log /var/log/nginx/error.log notice;
pid /var/run/nginx.pid;


events {
worker_connections 1024;
}


http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

#gzip on;
client_max_body_size 82M;

include /etc/nginx/conf.d/ragflow.conf;
}

8 changes: 8 additions & 0 deletions docker/nginx/proxy.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_buffering off;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
28 changes: 28 additions & 0 deletions docker/nginx/ragflow.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
server {
listen 80;
server_name _;
root /ragflow/web/dist;

gzip on;
gzip_min_length 1k;
gzip_comp_level 9;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";

location /v1 {
proxy_pass http://ragflow:9380;
include proxy.conf;
}

location / {
index index.html;
try_files $uri $uri/ /index.html;
}

# Cache-Control: max-age~@~AExpires
location ~ ^/static/(css|js|media)/ {
expires 10y;
access_log off;
}
}

0 comments on commit 4873964

Please sign in to comment.