crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

[thelounge] Don't load ldap configuration if it is disabled 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
certbot_on_virtu
Yohann D'ANELLO 2021-02-22 15:09:47 +01:00 committed by ynerant
parent e4bdec1dd8
commit 4c115a8b34
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host_vars/irc.adm.crans.org.yml
View File

@ -6,7 +6,7 @@ interfaces:
loc_certbot: loc_certbot:
- dns_rfc2136_server: '172.16.10.147' - dns_rfc2136_server: '172.16.10.147'
dns_rfc2136_name: certbot_challenge. dns_rfc2136_name: certbot_challenge.
dns_rfc2136_secret: "{{ vault_certbot_dns_secret }}" dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}"
mail: root@crans.org mail: root@crans.org
certname: crans.org certname: crans.org
domains: "irc.crans.org" domains: "irc.crans.org"

2
plays/nginx.yml
View File

@ -1,7 +1,7 @@
#!/usr/bin/env ansible-playbook #!/usr/bin/env ansible-playbook
--- ---
# Deploy Nginx # Deploy Nginx
- hosts: nginx - hosts: nginx,!adh_server
vars: vars:
nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}' nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
roles: roles:

3
roles/thelounge/templates/config.js.j2
View File

@ -392,7 +392,7 @@ module.exports = {
// - `enable`: when set to `false`, LDAP support is disabled and all other // - `enable`: when set to `false`, LDAP support is disabled and all other
// values are ignored. // values are ignored.
enable: {{ thelounge.ldap_enable }}, enable: {{ thelounge.ldap_enable }},
{% if thelounge.ldap_enable == "true" %}
// - `url`: A url of the form `ldaps://<ip>:<port>`. // - `url`: A url of the form `ldaps://<ip>:<port>`.
// For plain connections, use the `ldap` scheme. // For plain connections, use the `ldap` scheme.
url: "{{ thelounge.ldap.url }}", url: "{{ thelounge.ldap.url }}",
@ -442,6 +442,7 @@ module.exports = {
// - `scope`: LDAP search scope. It is set to `"sub"` by default. // - `scope`: LDAP search scope. It is set to `"sub"` by default.
scope: "{{ thelounge.ldap.scope }}", scope: "{{ thelounge.ldap.scope }}",
}, },
{% endif %}
}, },
// ## Debugging settings // ## Debugging settings