diff --git a/README.md b/README.md index 3874c88db54649ff90e23353f147a3b6b29f94c3..63cc3816139e3e59acdcd7132999ce6141abb3cb 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,7 @@ Role Variables | `funkwhale_env_vars` | `[]` | List of environment variables to append to the generated `.env` file. Example: `["AWS_ACCESS_KEY_ID=myawsid", "AWS_SECRET_ACCESS_KEY=myawskey"]` | | `funkwhale_external_storage_enabled` | `false` | If `true`, set up the proper configuration to use an external storage for media files | | `funkwhale_disable_django_admin` | `false` | If `true`, returns a 403 (Forbidden) for `/api/admin` | +| `funkwhale_gunicorn_extra_args` | `""` | Additional args to pass to gunicorn in the `funkwhale-server.service` file. Refer to [gunicorn's documentation](https://docs.gunicorn.org/en/stable/settings.html) for possible options | | `funkwhale_install_path` | `/srv/funkwhale` | Path where frontend, api and virtualenv files should be stored (**no trailing slash**) | | `funkwhale_letsencrypt_certbot_flags` | `null` | Additional flags to pass to `certbot` | | `funkwhale_letsencrypt_enabled` | `true` | If `true`, will configure SSL with certbot and Let's Encrypt | diff --git a/defaults/main.yml b/defaults/main.yml index 569ce6442ffb35e0e68f58c77ed0eb06c28cdab0..96c5c55a6935b5d03530b7036db9eaccee73f650 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -43,6 +43,7 @@ funkwhale_redis_managed: true funkwhale_api_ip: 127.0.0.1 funkwhale_api_port: 5000 funkwhale_web_workers: 1 +funkwhale_gunicorn_extra_args: "" funkwhale_settings_module: config.settings.production funkwhale_env_vars: [] funkwhale_systemd_managed: true diff --git a/tasks/services.yml b/tasks/services.yml index d07b6f6876d366e6c5f16cb4b304372aca5647ab..9ff452de20ea1890069ebb1a3ea3f07baf9e225f 100644 --- a/tasks/services.yml +++ b/tasks/services.yml @@ -13,7 +13,7 @@ command: "{{ funkwhale_install_path }}/virtualenv/bin/celery -A funkwhale_api.taskapp worker -l INFO" - name: server description: Funkwhale application server - command: "{{ funkwhale_install_path }}/virtualenv/bin/gunicorn config.asgi:application -w ${FUNKWHALE_WEB_WORKERS} -k uvicorn.workers.UvicornWorker -b ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}" + command: "{{ funkwhale_install_path }}/virtualenv/bin/gunicorn config.asgi:application -w ${FUNKWHALE_WEB_WORKERS} -k uvicorn.workers.UvicornWorker -b ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT} {{ funkwhale_gunicorn_extra_args }}" - name: beat description: Funkwhale celery beat process command: "{{ funkwhale_install_path }}/virtualenv/bin/celery -A funkwhale_api.taskapp beat -l INFO"