Fix ldap.secret format
Merge ubuntu_auth