diff --git a/group_vars/git.yml b/group_vars/git.yml index aae48b0a..0400106d 100644 --- a/group_vars/git.yml +++ b/group_vars/git.yml @@ -138,5 +138,6 @@ gitea_fail2ban_jail_action: "iptables-allports" ### mgrote_gitea_setup gitea_ldap_host: "ldap.mgrote.net" gitea_ldap_bind_pass: "{{ lookup('keepass', 'lldap_ldap_user_pass', 'password') }}" -gitea_admin_user: "forgejo_bind_user" +gitea_admin_user: "fadmin" gitea_admin_user_pass: "{{ lookup('keepass', 'lldap_forgejo_bind_user', 'password') }}" +gitea_ldap_bind_user: "forgejo_bind_user" diff --git a/roles/mgrote_gitea_setup/tasks/ldap.yml b/roles/mgrote_gitea_setup/tasks/ldap.yml index f8ef6401..a56dad0e 100644 --- a/roles/mgrote_gitea_setup/tasks/ldap.yml +++ b/roles/mgrote_gitea_setup/tasks/ldap.yml @@ -15,7 +15,7 @@ --security-protocol "unencrypted" \ --host "{{ gitea_ldap_host }}" \ --port "3890" \ - --bind-dn "uid=ladmin,ou=people,dc=mgrote,dc=net" \ + --bind-dn "uid={{ gitea_ldap_bind_user }},ou=people,dc=mgrote,dc=net" \ --bind-password "{{ gitea_ldap_bind_pass }}" \ --user-search-base "ou=people,dc=mgrote,dc=net" \ --user-filter "(&(memberof=cn=gitea,ou=groups,dc=mgrote,dc=net)(|(uid=%[1]s)(mail=%[1]s)))" \ @@ -41,7 +41,7 @@ --security-protocol "unencrypted" \ --host "{{ gitea_ldap_host }}" \ --port "3890" \ - --bind-dn "uid=ladmin,ou=people,dc=mgrote,dc=net" \ + --bind-dn "uid={{ gitea_ldap_bind_user }},ou=people,dc=mgrote,dc=net" \ --bind-password "{{ gitea_ldap_bind_pass }}" \ --user-search-base "ou=people,dc=mgrote,dc=net" \ --user-filter "(&(memberof=cn=gitea,ou=groups,dc=mgrote,dc=net)(|(uid=%[1]s)(mail=%[1]s)))" \