diff --git a/prod_rmq_agents/get-next-uid-gid.py b/prod_rmq_agents/get-next-uid-gid.py index 5fbd7e4de50c9edbb4889b654ac4360e06dd9765..49686059c6a14e36baffe42779f5ab2b9771b44c 100644 --- a/prod_rmq_agents/get-next-uid-gid.py +++ b/prod_rmq_agents/get-next-uid-gid.py @@ -36,7 +36,7 @@ def create_account(msg): # Bright command to create user cmd = "/cm/local/apps/cmd/bin/cmsh -c " - cmd += f'"user; add {username}; set id {uid}; set email {email}; set commonname \\"{fullname}\\"; ' + cmd += f'"user; add {username}; set userid {uid}; set email {email}; set commonname \\"{fullname}\\"; ' cmd += 'commit;"' if not args.dry_run: diff --git a/prod_rmq_agents/git_commit.py b/prod_rmq_agents/git_commit.py index 37aa34b014262a9e1b347db5f67d3ae1d0614a98..697bdabcb0451f6f7794d014aa2c3a435370ecac 100644 --- a/prod_rmq_agents/git_commit.py +++ b/prod_rmq_agents/git_commit.py @@ -61,26 +61,26 @@ def git_commit(ch, method, properties, body): group_ldif, "w" ) as ldif_g: logger.debug( - f"ldapsearch -LLL -x -H ldaps://ldapserver -b 'dc=cm,dc=cluster' uid={username} > {user_ldif}" + f"ldapsearch -LLL -x -h ldapserver -b 'dc=cm,dc=cluster' uid={username} > {user_ldif}" ) ldapsearch( "-LLL", "-x", - "-H", - "ldaps://ldapserver", + "-h", + "ldapserver", "-b", "dc=cm,dc=cluster", f"uid={username}", _out=ldif_u, ) logger.debug( - f"ldapsearch -LLL -x -H ldapserver -b 'ou=Group,dc=cm,dc=cluster' cn={username} > {group_ldif}" + f"ldapsearch -LLL -x -h ldapserver -b 'ou=Group,dc=cm,dc=cluster' cn={username} > {group_ldif}" ) ldapsearch( "-LLL", "-x", - "-H", - "ldaps://ldapserver", + "-h", + "ldapserver", "-b", "ou=Group,dc=cm,dc=cluster", f"cn={username}",