From 3888b299836569c780d43213c5b100f3f5674666 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 13 Oct 2022 20:21:02 +0200 Subject: [PATCH] potential solution to the chat docker problem --- files/templates/chat.html | 13 ++++++++++--- startup_docker.sh | 4 ---- ubuntu_setup.sh | 5 +++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/files/templates/chat.html b/files/templates/chat.html index d3e64dac2..b79c8b5ea 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -20,7 +20,11 @@ {{v.css | safe}} {% endif %} - + {% if SITE == 'localhost' %} + + {% else %} + + {% endif %} @@ -41,8 +45,11 @@ data-hat="{{v.hat_active}}"> - + {% if SITE == 'localhost' %} + + {% else %} + + {% endif %} - diff --git a/startup_docker.sh b/startup_docker.sh index 7f9606d65..77a1d87c5 100644 --- a/startup_docker.sh +++ b/startup_docker.sh @@ -3,9 +3,5 @@ export DATABASE_URL="postgresql://postgres@postgres:5432" export REDIS_URL="redis://redis:6379" export PROXY_URL="http://opera-proxy:18080" /etc/init.d/nginx start -cd ./chat -yarn install -yarn chat -cd .. gunicorn files.__main__:app load_chat -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 -b 0.0.0.0:5001 --max-requests 30000 --max-requests-jitter 30000 -D gunicorn files.__main__:app -k gevent -w 1 --reload -b 0.0.0.0:5000 --max-requests 30000 --max-requests-jitter 10000 diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh index 284e58cca..7b3ae5817 100644 --- a/ubuntu_setup.sh +++ b/ubuntu_setup.sh @@ -81,3 +81,8 @@ echo "tmux -S /tmp/s a -t 0" > /c echo "tmux -S /tmp/s a -t 1" > /c2 echo "cd /rDrama && git pull" > /g echo '{"Bots": true, "Fart mode": false, "Read-only mode": false, "Signups": true, "login_required": false}' > /site_settings.json + +cd ./chat +yarn install +yarn chat +cd ..