kahluaband#41 Feat. set uwsgi_read_timeout

woogieon8on · woogieon8on · commit a36dc36bf727 · 2024-01-10T23:19:56.000+09:00
diff --git a/.config/nginx/kahluaproject.conf b/.config/nginx/kahluaproject.conf
@@ -6,6 +6,7 @@ server {
 
     location / {
         uwsgi_pass  unix:///tmp/kahluaproject.sock;
+        uwsgi_read_timeout 300;
         include     uwsgi_params;
     }
 
diff --git a/kahluaproject/settings.py b/kahluaproject/settings.py
@@ -48,12 +48,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-<<<<<<< HEAD
-ALLOWED_HOSTS = ['0.0.0.0', '127.0.0.1', 'localhost', 
-                 ".ap-northeast-2.compute.amazonaws.com", ".kahluaband.com"]
-=======
-ALLOWED_HOSTS = ['0.0.0.0', '127.0.0.1', 'localhost', ".ap-northeast-2.compute.amazonaws.com"]
->>>>>>> dc4dd0ef09452d301a714d2274ad8dea82967b6f
+ALLOWED_HOSTS = ['0.0.0.0', '127.0.0.1', 'localhost', ".ap-northeast-2.compute.amazonaws.com", ".kahluaband.com"]
 
 # Application definition
 AUTH_USER_MODEL = 'users.User'

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ server {`
`6`	`6`
`7`	`7`	`location / {`
`8`	`8`	`uwsgi_pass unix:///tmp/kahluaproject.sock;`
	`9`	`+ uwsgi_read_timeout 300;`
`9`	`10`	`include uwsgi_params;`
`10`	`11`	`}`
`11`	`12`