fix some ports, module versions, add admin

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 2d84563e5f3202dc9fb26c2150d56ceb935b0f25..8183ef7e4a2b3e9b4439e83ad5dbbf359768297e 100644 (file)
--- 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 ceadb91ba5cdabbde3f31bb3cbd4cdc656a93532..a276aea3a605e11667fd32fde066058d4763ef98 100644 (file)
--- 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 1ebd5151d05131e80250b50846de291eb99d8224..01475ef7018a0d05dbafc8bc10ebad2f9e512287 100644 (file)
--- 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 18b03bc6612bab72d67725a2ce8df123970e5691..e7da1ac3220ab755c9318cf3759dd6d49ce8807c 100644 (file)
--- 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