Merge branch 'ngx-custom-config' into 'master'

Add setting for custom nginx config

See merge request funkwhale/ansible!22

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 |

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

templates/nginx.conf.j2

@@ -146,4 +146,5 @@ server {
         return 403;
     }
 {% endif -%}
+{{ funkwhale_nginx_additional_config }}
 }