fix uwsgi config, fix settings

diff --git a/app/settings.py b/app/settings.py
index 4c55374bbf3f82aae0050cbd8d735074fdc404fd..852b3059b973a3c4212031d3ecee7d413eb1d92e 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -35,6 +35,7 @@ ALLOWED_HOSTS = [
     'localhost', 
     'el.pro-barreau.dockdev.pilotsystems.net',
     'e-learning.pro-barreau.com',    
+    'staging.el.pro-barreau.parisson.com'
 ]
 
 DATABASES = {
@@ -105,7 +106,7 @@ MEDIA_ROOT = '/srv/media/'
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 #MEDIA_URL = 'http://pre-barreau.com/archives/'
-MEDIA_URL = '/media/'
+MEDIA_URL = 'https://e-learning.pro-barreau.com/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files

diff --git a/app/wsgi.ini b/app/wsgi.ini
index 1f18bf1ddab0998d70b3b3d6b1107a2f465975b0..8f56c13de620165e01a01d1e4ff58114750a1da3 100644 (file)
--- a/app/wsgi.ini
+++ b/app/wsgi.ini
@@ -30,11 +30,11 @@ reload-on-rss = 4096                 ; Restart workers after this much resident
 worker-reload-mercy = 300            ; How long to wait before forcefully killing workers
 
 cheaper-algo = busyness
-processes = 64                       ; Maximum number of workers allowed
-cheaper = 24                         ; Minimum number of workers allowed
-cheaper-initial = 24                 ; Workers created at startup
+processes = 4                       ; Maximum number of workers allowed
+cheaper = 2                         ; Minimum number of workers allowed
+cheaper-initial = 2                 ; Workers created at startup
 cheaper-overload = 1                 ; Length of a cycle in seconds
-cheaper-step = 8                     ; How many workers to spawn at a time
+cheaper-step = 1                     ; How many workers to spawn at a time
 
 cheaper-busyness-multiplier = 30     ; How many cycles to wait before killing workers
 cheaper-busyness-min = 20            ; Below this threshold, kill workers (if stable for multiplier cycles)

diff --git a/app/wsgi.sh b/app/wsgi.sh
index ca4238f8ece85b05cc518c02220f20a703b2e803..417e0e7bab8fabb09d2ceafca84ae0246bcaea2d 100755 (executable)
--- a/app/wsgi.sh
+++ b/app/wsgi.sh
@@ -41,7 +41,7 @@ else
     # watchmedo shell-command --patterns="$patterns" --recursive \
     #     --command='python '$manage' collectstatic --noinput' $app &
 
-    python $manage collectstatic --noinput
+    #python $manage collectstatic --noinput
 
     chown -R www-data: $debug_log