Fix dockerrun command for uwsgi usage

vstconsulting · Sep 16, 2019 · 6e46eb3 · 6e46eb3
1 parent efc30c0
commit 6e46eb3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/polemarch/__init__.py b/polemarch/__init__.py
@@ -31,6 +31,6 @@
     "VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
 }
 
-__version__ = "1.4.5"
+__version__ = "1.4.4"
 
 prepare_environment(**default_settings)
diff --git a/polemarch/main/settings.py b/polemarch/main/settings.py
@@ -1,6 +1,8 @@
 from collections import OrderedDict
 from vstutils.settings import *
 
+WEBSERVER_COMMAND = 'webserver'
+
 POLEMARCH_VERSION = PROJECT_VERSION
 APACHE = False if ("runserver" in sys.argv) else True
 

diff --git a/polemarch/web.ini b/polemarch/web.ini
@@ -7,13 +7,19 @@ program_name = %(lib_name)
 module = %(program_name).wsgi:application
 
 # number of workers
+if-not-opt = processes
 processes = %k
+endif=
 
 # number of threads per worker
+if-not-opt = threads
 threads = 2
+endif=
 
 # PID-file for service
+if-not-opt = pidfile
 pidfile = /var/run/%(program_name)/web.pid
+endif=
 
 # Fix mime types
 mimefile = /etc/mime.types

diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -1,2 +1,2 @@
 # Docs
-vstutils[doc]~=2.8.1
+vstutils[doc]~=2.8.2
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # Main
-vstutils[rpc,ldap,doc,prod]~=2.8.1
+vstutils[rpc,ldap,doc,prod]~=2.8.2
 docutils==0.15.2
 markdown2==2.3.8