From 55a55100db382b3758a756383cbfa0d5a1f3687b Mon Sep 17 00:00:00 2001 From: Jean-Yves <7360784+docjyJ@users.noreply.github.com> Date: Sat, 27 Sep 2025 15:53:05 +0200 Subject: [PATCH] Then update script Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com> --- community-containers/lldap/lldap.json | 60 ++++++++++----------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/community-containers/lldap/lldap.json b/community-containers/lldap/lldap.json index 02e0a7b4..df4a5ae3 100644 --- a/community-containers/lldap/lldap.json +++ b/community-containers/lldap/lldap.json @@ -41,50 +41,34 @@ "nextcloud_exec_commands": [ "php /var/www/html/occ app:install user_ldap", "php /var/www/html/occ app:enable user_ldap", - "# Get Base", - "BASE_DN=\"dc=${NC_DOMAIN//./,dc=}\"", - "# Create a new empty ldap config", "CONF_NAME=$(php /var/www/html/occ ldap:create-empty-config -p)", - "# Check that the base DN matches your domain and retrieve your configuration name", - "echo \"Base DN: '$BASE_DN', Config name: '$CONF_NAME'\"", - "# Set the ldap password", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentPassword \"\"", - "# Set the ldap config: Host and connection", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAdminGroup lldap_admin", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentName \"cn=admin,ou=people,$BASE_DN\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBase \"$BASE_DN\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapHost \"ldap://nextcloud-aio-lldap\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapPort 3890", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapTLS 0", - "php /var/www/html/occ ldap:set-config $CONF_NAME turnOnPasswordChange 0", - "# Set the ldap config: Users", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseUsers \"ou=people,$BASE_DN\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapEmailAttribute mail", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGidNumber gidNumber", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilter \"(&(|(objectclass=person))(|(uid=%uid)(|(mailPrimaryAddress=%uid)(mail=%uid))))\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterEmail 1", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterUsername 1", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserAvatarRule default", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserDisplayName cn", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilter \"(|(objectclass=person))\"", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterMode 0", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterObjectclass person", - "# Set the ldap config: Groups", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseGroups \"ou=groups,$BASE_DN\"", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentPassword '%LLDAP_LDAP_USER_PASS%'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAdminGroup lldap_admin", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentName 'cn=admin,ou=people,%NC_BASE_DN%'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBase '%NC_BASE_DN%'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapHost 'ldap://nextcloud-aio-lldap'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapPort 3890", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapTLS 0", + "php /var/www/html/occ ldap:set-config $CONF_NAME turnOnPasswordChange 0", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseUsers 'ou=people,%NC_BASE_DN%'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapEmailAttribute mail", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGidNumber gidNumber", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilter '(&(|(objectclass=person))(|(uid=%uid)(|(mailPrimaryAddress=%uid)(mail=%uid))))'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterEmail 1", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterUsername 1", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserAvatarRule default", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserDisplayName cn", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilter '(|(objectclass=person))'", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterMode 0", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterObjectclass person", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseGroups 'ou=groups,%NC_BASE_DN%'", "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupDisplayName cn", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilter \"(&(|(objectclass=groupOfUniqueNames)))\"", + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilter '(&(|(objectclass=groupOfUniqueNames)))'", "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilterMode 0", "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilterObjectclass groupOfUniqueNames", "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupMemberAssocAttr uniqueMember", "php /var/www/html/occ ldap:set-config $CONF_NAME useMemberOfToDetectMembership 1", - "# Optional : Check the configuration", - "#php /var/www/html/occ ldap:show-config $CONF_NAME", - "# Test the ldap config", - "php /var/www/html/occ ldap:test-config $CONF_NAME", - "# Enable ldap config", - "php /var/www/html/occ ldap:set-config $CONF_NAME ldapConfigurationActive 1", - "# Exit the container shell", - "exit" + "php /var/www/html/occ ldap:set-config $CONF_NAME ldapConfigurationActive 1" ] } ]