diff --git a/debian/control b/debian/control index 743d68b..9acf0bc 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Depends: ${misc:Depends}, python3-django-tenant-schemas, python3-psycopg2, python3-django-mellon, + python3-uwsgidecorators, uwsgi, uwsgi-plugin-python3 Recommends: nginx, graphicsmagick diff --git a/debian/fargo.dirs b/debian/fargo.dirs index 28a9624..11a6c1a 100644 --- a/debian/fargo.dirs +++ b/debian/fargo.dirs @@ -1,5 +1,6 @@ /etc/fargo /usr/lib/fargo /var/lib/fargo/collectstatic +/var/lib/fargo/spooler /var/lib/fargo/tenants /var/log/fargo diff --git a/debian/fargo.init b/debian/fargo.init index 0cba62f..7517406 100644 --- a/debian/fargo.init +++ b/debian/fargo.init @@ -38,6 +38,7 @@ GROUP=$NAME DAEMON_ARGS=${DAEMON_ARGS:-"--pidfile=$PIDFILE --uid $USER --gid $GROUP --ini /etc/$NAME/uwsgi.ini +--spooler /var/lib/$NAME/spooler/ --daemonize /var/log/uwsgi.$NAME.log"} # Load the VERBOSE setting and other rcS variables diff --git a/debian/fargo.postinst b/debian/fargo.postinst index abfd5cf..7f815ff 100644 --- a/debian/fargo.postinst +++ b/debian/fargo.postinst @@ -20,6 +20,7 @@ case "$1" in # ensure dirs ownership chown $USER:$GROUP /var/log/$NAME chown $USER:$GROUP /var/lib/$NAME/collectstatic + chown $USER:$GROUP /var/lib/$NAME/spooler chown $USER:$GROUP /var/lib/$NAME/tenants # create a secret file SECRET_FILE=$CONFIG_DIR/secret diff --git a/debian/fargo.service b/debian/fargo.service index cf62825..35657a5 100644 --- a/debian/fargo.service +++ b/debian/fargo.service @@ -10,7 +10,8 @@ User=%p Group=%p ExecStartPre=/usr/bin/fargo-manage migrate_schemas --noinput --verbosity 1 ExecStartPre=/usr/bin/fargo-manage collectstatic --noinput -ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini +ExecStartPre=/bin/mkdir -p /var/lib/fargo/spooler/%m/ +ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini --spooler /var/lib/fargo/spooler/%m/ ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGQUIT TimeoutStartSec=0 diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini index 32e25ae..17a3f92 100644 --- a/debian/uwsgi.ini +++ b/debian/uwsgi.ini @@ -12,6 +12,9 @@ http-socket = /run/fargo/fargo.sock chmod-socket = 666 vacuum = true +spooler-processes = 3 +spooler-max-tasks = 20 + master = true enable-threads = true harakiri = 120