Added LDAP Draft for Funkwhale

roles/docker-funkwhale/templates/env.j2

@@ -99,19 +99,21 @@ DJANGO_SETTINGS_MODULE=config.settings.production
 # Generate one using `openssl rand -base64 45`, for example
 DJANGO_SECRET_KEY={{funkwhale_django_secret}}
 
+{% if ldap_enabled | bool %}
 # LDAP settings
 # Use the following options to allow authentication on your Funkwhale instance
 # using a LDAP directory.
 # Have a look at https://docs.funkwhale.audio/installation/ldap.html for
 # detailed instructions.
 
-# LDAP_ENABLED=False
-# LDAP_SERVER_URI=ldap://your.server:389
-# LDAP_BIND_DN=cn=admin,dc=domain,dc=com
-# LDAP_BIND_PASSWORD=bindpassword
-# LDAP_SEARCH_FILTER=(|(cn={0})(mail={0}))
-# LDAP_START_TLS=False
-# LDAP_ROOT_DN=dc=domain,dc=com
+LDAP_ENABLED=True
+LDAP_SERVER_URI={{ldap.server.uri}}
+LDAP_BIND_DN={{ldap.dn.administrator}}
+LDAP_BIND_PASSWORD={{applications.ldap.administrator_database_password}}
+LDAP_SEARCH_FILTER=(|(cn={0})(mail={0})) # Needs to checked 
+LDAP_START_TLS=False
+LDAP_ROOT_DN={{ldap.dn.root}}
+{% endif %}
 
 FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist
 

roles/docker-funkwhale/vars/main.yml

@@ -2,7 +2,7 @@ application_id:                                 "funkwhale"
 nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"
 database_password:                              "{{funkwhale_database_password}}"
 database_type:                                  "postgres"
-ldap_network_enabled:                           "{{ldap.enabled}}"
+ldap_enabled:                                   True
 media_root:                                     "/srv/funkwhale/data/"
 static_root:                                    "{{media_root}}static"
 celeryd_concurrency:                            1