diff --git a/README.md b/README.md index eee6b819739ea5f507428eadd7db03783821cefe..8aa21246b63332ca2c31e68ffd8e4100d456636d 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ Role Variables | `funkwhale_letsencrypt_enabled` | `true` | If `true`, will configure SSL with certbot and Let's Encrypt | | `funkwhale_media_path` | `/srv/funkwhale/data/media` | Path where audio and uploaded files should be stored (**no trailing slash**) | | `funkwhale_music_path` | `/srv/funkwhale/data/music` | Path to your existing music library, to use with [CLI import](https://docs.funkwhale.audio/admin/importing-music.html) (**no trailing slash**) | +| `funkwhale_nginx_additional_config` | `""` | Additional nginx configuration to add to the Funkwhale `server{}` block | | `funkwhale_nginx_managed` | `true` | If `true`, will install and configure nginx | | `funkwhale_nginx_tls_configure_ciphers` | `true` | Set TLS ciphers, curves, etc, overriding any settings in http{} | | `funkwhale_nginx_max_body_size` | `100M` | Value of nginx's `max_body_size` parameter to use | diff --git a/defaults/main.yml b/defaults/main.yml index 8279261bdf1f773ae78bbcfaafa2938861887674..2c673285cd6292b5399cfa78cd32eeffa7d6dd4a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,6 +31,7 @@ funkwhale_nginx_tls_termination: true funkwhale_nginx_tls_configure_ciphers: true funkwhale_nginx_max_body_size: 100M funkwhale_nginx_use_compression: true +funkwhale_nginx_additional_config: funkwhale_ssl_cert_path: funkwhale_ssl_key_path: funkwhale_protocol: https diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index b7f24beb62297ff7b5104cc26bf7a1cf5391bd13..6712e059c9be72749fdd11dce6599a2ff8614657 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -146,4 +146,5 @@ server { return 403; } {% endif -%} +{{ funkwhale_nginx_additional_config }} }