Merge branch 'master' of https://git.habibapp.com/dovodi/Dovodi_Backend

1 week ago · 9ca3554d63
2 changed files with 7 additions and 7 deletions
--- a/.env.prod
+++ b/.env.prod
@ -1,6 +1,6 @@
-DJANGO_ALLOWED_HOSTS=127.0.0.1,imamjavad.nwhco.ir,www.imamjavad.nwhco.ir,*.nwhco.ir,188.40.92.124,88.99.212.243,dovodi.newhorizonco.uk,dovodi.nwhco.ir,*.newhorizonco.uk,0.0.0.0,imamjavad.newhorizonco.uk,imamjavad.nwhco.ir,static.243.212.99.88.clients.your-server.de,test.imamjavad.online,*.imamjavad.online,imamjavad.online
+DJANGO_ALLOWED_HOSTS=127.0.0.1,imamjavad.nwhco.ir,www.imamjavad.nwhco.ir,*.nwhco.ir,188.40.92.124,88.99.212.243,dovodi.newhorizonco.uk,dovodi.nwhco.ir,*.newhorizonco.uk,0.0.0.0,imamjavad.newhorizonco.uk,imamjavad.nwhco.ir,static.243.212.99.88.clients.your-server.de,test.imamjavad.online,*.imamjavad.online,imamjavad.online,dashboard-dovodi.newhorizonco.uk,dovodi-agent.newhorizonco.uk
 DJANGO_SETTINGS_MODULE=config.settings.production
-DJANGO_TRUSTED_ORIGINS=http://127.0.0.1:8000,http://127.0.0.1:8001,https://127.0.0.1:8000,https://127.0.0.1:8001,http://imamjavad.nwhco.ir,https://imamjavad.nwhco.ir,http://www.imamjavad.nwhco.ir,https://www.imamjavad.nwhco.ir,http://*.nwhco.ir,https://*.nwhco.ir,http://188.40.92.124,https://188.40.92.124,http://88.99.212.243,https://88.99.212.243,http://dovodi.newhorizonco.uk,https://dovodi.newhorizonco.uk,http://*.newhorizonco.uk,https://*.newhorizonco.uk,http://0.0.0.0,https://0.0.0.0,http://imamjavad.newhorizonco.uk,https://imamjavad.newhorizonco.uk,https://imamjavad.nwhco.ir,https://dovodi.nwhco.ir,https://test.imamjavad.online,https://imamjavad.online
+DJANGO_TRUSTED_ORIGINS=http://127.0.0.1:8000,http://127.0.0.1:8001,https://127.0.0.1:8000,https://127.0.0.1:8001,http://imamjavad.nwhco.ir,https://imamjavad.nwhco.ir,http://www.imamjavad.nwhco.ir,https://www.imamjavad.nwhco.ir,http://*.nwhco.ir,https://*.nwhco.ir,http://188.40.92.124,https://188.40.92.124,http://88.99.212.243,https://88.99.212.243,http://dovodi.newhorizonco.uk,https://dovodi.newhorizonco.uk,http://*.newhorizonco.uk,https://*.newhorizonco.uk,http://0.0.0.0,https://0.0.0.0,http://imamjavad.newhorizonco.uk,https://imamjavad.newhorizonco.uk,https://imamjavad.nwhco.ir,https://dovodi.nwhco.ir,https://test.imamjavad.online,https://imamjavad.online,https://dashboard-dovodi.newhorizonco.uk,http://dashboard-dovodi.newhorizonco.uk,https://dovodi-agent.newhorizonco.uk,http://dovodi-agent.newhorizonco.uk/


 #[database.POSTGRES]
@ -11,10 +11,10 @@ POSTGRES_PORT="5432"
 POSTGRES_HOST="postgres"


-REDIS_URL=redis://dovodi_redis:6379/0
+REDIS_URL=redis://imam-javad_redis:6379/0
 # celery
-CELERY_BROKER=redis://dovodi_redis:6379/0
-CELERY_BACKEND=redis://dovodi_redis:6379/0
+CELERY_BROKER=redis://imam-javad_redis:6379/0
+CELERY_BACKEND=redis://imam-javad_redis:6379/0
 FLOWER_UNAUTHENTICATED_API=true
 TIMEZONE="Asia/Tehran"
 CELERY_TIMEZONE="Asia/Tehran"
@ -24,4 +24,4 @@ PLAUSIBLE_DOMAIN='http://127.0.0.1:8000/'
 captcha_public_key="6LdgCjseAAAAAIwg41-kyyulmwDtqD2Gk3THIwy2"
 captcha_private_key="6LdgCjseAAAAAPHMsIHuQgYAGTJ7_QlhqG4G0NyS"
 ONLINE_CLASS_FRONTEND_DOMAIN="imamjavad.newhorizonco.uk"
-FCM_API_KEY=""
+FCM_API_KEY=""
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -7,7 +7,7 @@ services:
    build:
      context: .
      dockerfile: Dockerfile.prod
-    command: gunicorn config.wsgi:application --bind 0.0.0.0:8000 --workers=3 --threads=2 --max-requests=1000 --max-requests-jitter=100 --timeout 180
+    command: gunicorn config.wsgi:application --bind 0.0.0.0:8000 --workers=2 --threads=2 --max-requests=1000 --max-requests-jitter=100 --timeout 180
    volumes:
      # - static_volume:/usr/src/app/static
      - media_volume:/usr/src/app/media