From 95b8ba67bcc07f2284dd066798307626c824c034 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 1 May 2019 08:48:22 +0000 Subject: [PATCH] fix some ports, module versions, add admin --- app/deploy/start_app.sh | 13 +++++++------ app/diggersdigest/local_settings.py | 3 +++ docker-compose.yml | 2 ++ requirements.txt | 5 +++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh index 2d84563..8183ef7 100644 --- a/app/deploy/start_app.sh +++ b/app/deploy/start_app.sh @@ -1,8 +1,8 @@ #!/bin/sh # options -procs=4 -threads=4 +procs=2 +threads=2 # paths root='/opt/' @@ -20,13 +20,14 @@ python $manage migrate --noinput python $manage collectstatic --noinput # static files auto update -watchmedo shell-command --patterns="*.js;*.css" --recursive \ - --command='python '$manage' collectstatic --noinput' $sandbox & +#watchmedo shell-command --patterns="*.js;*.css" --recursive \ +# --command='python '$manage' collectstatic --noinput' $sandbox & # app start uwsgi --socket :8000 --wsgi-file $wsgi --chdir $sandbox --master \ --processes $procs --threads $threads \ - --touch-reload $wsgi \ - --limit-post=4294967296 + --touch-reload $wsgi + +# --limit-post=4294967296 #python $manage runserver 0.0.0.0:8000 diff --git a/app/diggersdigest/local_settings.py b/app/diggersdigest/local_settings.py index ceadb91..a276aea 100644 --- a/app/diggersdigest/local_settings.py +++ b/app/diggersdigest/local_settings.py @@ -1,6 +1,9 @@ DEBUG = False +ADMINS = ( + ('Guillaume Pellerin', 'webmaster@parisson.com'), +) # Make these unique, and don't share it with anybody. SECRET_KEY = "+3b01&_6_m@@yb4f06$s0zno8vkybh81nbuj_q(xzk+xeih1+s" NEVERCACHE_KEY = "l11tr%#!uc@+%$51(&+%=&z6h9yrw42(jpcj$3_&6evtu6hl%z" diff --git a/docker-compose.yml b/docker-compose.yml index 1ebd515..01475ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ app: - media links: - db + ports: + - "8002:8000" nginx: image: nginx diff --git a/requirements.txt b/requirements.txt index 18b03bc..e7da1ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ --index-url https://pypi.python.org/simple/ setuptools -Django==1.8.4 -MySQL-python==1.2.5 +Django==1.8.* +mysqlclient==1.3.14 cartridge==0.10.0 mezzanine==4.0.1 django-uuidfield==0.5.0 @@ -11,3 +11,4 @@ django-contrib-comments==1.7.1 parsedatetime==1.5 watchdog uwsgi +bleach==1.5.0 -- 2.39.5