connect

salt/manager/tools/sbin/so-user

@@ -136,7 +136,6 @@ bcryptRounds=${BCRYPT_ROUNDS:-12}
 elasticUsersFile=${ELASTIC_USERS_FILE:-/opt/so/saltstack/local/salt/elasticsearch/files/users}
 elasticRolesFile=${ELASTIC_ROLES_FILE:-/opt/so/saltstack/local/salt/elasticsearch/files/users_roles}
 socRolesFile=${SOC_ROLES_FILE:-/opt/so/conf/soc/soc_users_roles}
-clientRolesFile=${SOC_ROLES_FILE:-/opt/so/conf/soc/soc_clients_roles}
 esUID=${ELASTIC_UID:-930}
 esGID=${ELASTIC_GID:-930}
 soUID=${SOCORE_UID:-939}
@@ -283,18 +282,6 @@ function ensureRoleFileExists() {
     fi
     mv "${rolesTmpFile}" "${socRolesFile}"
   fi
-
-  if [[ ! -f "$clientRolesFile" || ! -s "$clientRolesFile" ]]; then
-    # Generate the new client roles file
-    rolesTmpFile="${clientRolesFile}.tmp"
-    createFile "$rolesTmpFile" "$soUID" "$soGID"
-
-    if [[ -d "$clientRolesFile" ]]; then
-      echo "Removing invalid roles directory created by Docker"
-      rm -fr "$clientRolesFile"
-    fi
-    mv "${rolesTmpFile}" "${clientRolesFile}"
-  fi
 }
 
 function syncElasticSystemUser() {
@@ -370,7 +357,6 @@ function syncElastic() {
       random_crypt=$(get_random_value 53)
       user_data_formatted=$(echo "${user_data_formatted}" | sed -r "s/^(.+:)\$/\\1\$2a\$12${random_crypt}/")
     fi
-
     echo "${user_data_formatted}" >> "$usersTmpFile"
 
     # Append the user roles
@@ -386,10 +372,6 @@ function syncElastic() {
         sqlite3 -cmd ".timeout ${databaseTimeout}" "$databasePath" >> "$rolesTmpFile"
       [[ $? != 0 ]] && fail "Unable to read role identities from database"
     done < "$socRolesFile"
-
-    # Append the client roles
-    cat "$clientRolesFile" >> "$rolesTmpFile"
-
   else
     echo "Database file or soc roles file does not exist yet, skipping users export"
   fi