diff --git a/defaults/main.yml b/defaults/main.yml index 541816d..10c09f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,3 @@ ---- -# defaults file for mbs - # Which module-build-service pkg we want to deploy/install (pinning a version instead of latest) mbs_pkg_version: 3.6.1-7 @@ -151,8 +148,13 @@ mbs_frontend_auth_type: kerberos # HTTP keytab distributed from pkistore for httpd vhost mbs_frontend_krb_keytab: localhost.keytab mbs_frontend_krb_host: 'localhost' + +# LDAP settings, like binddn , ldap host, etc mbs_frontend_ldap_uri: '' +mbs_frontend_ldap_users_dn: '' mbs_frontend_ldap_dn_groups: '' +mbs_frontend_ldap_bind_user: '' +mbs_frontend_ldap_bind_password: '' # Zabbix monitoring additional groups and templates specific to mbs diff --git a/tasks/main.yml b/tasks/main.yml index 4e77ce4..eb30cdf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -18,6 +18,8 @@ tags: - messaging - umb + - config + # msb-frontend setup - include_tasks: mbs-frontend.yml when: mbs_frontend | bool diff --git a/tasks/mbs-backend.yml b/tasks/mbs-backend.yml index 7720a45..b8bea19 100644 --- a/tasks/mbs-backend.yml +++ b/tasks/mbs-backend.yml @@ -40,6 +40,7 @@ - Restart fedmsg-hub tags: - messaging + - config - name: copy koji configuration ansible.builtin.template: diff --git a/templates/mbs/config.py.j2 b/templates/mbs/config.py.j2 index bb8f0b8..3d663ea 100644 --- a/templates/mbs/config.py.j2 +++ b/templates/mbs/config.py.j2 @@ -102,7 +102,9 @@ class ProdConfiguration(object): KERBEROS_KEYTAB = '{{ mbs_frontend_krb_keytab }}' KERBEROS_HTTP_HOST = '{{ mbs_frontend_krb_host }}' LDAP_URI = '{{ mbs_frontend_ldap_uri }}' - LDAP_GROUPS_DN = '{{ mbs_frontend_ldap_dn_groups }}' + LDAP_USERS_DN = '{{ mbs_frontend_ldap_users_dn }}' + LDAP_USER = '{{ mbs_frontend_ldap_bind_user }}' + LDAP_PASSWORD = '{{ mbs_frontend_ldap_bind_password }}' ALLOWED_GROUPS = {{ mbs_config_allowed_groups }} ALLOWED_USERS = {{ mbs_config_allowed_users }} ADMIN_GROUPS = {{ mbs_config_admin_groups }}