From c531ef0773df174d92dd2ce2ae5b9504442749bd Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 26 May 2021 13:44:30 -0400 Subject: [PATCH] Move user sync'd files to saltstack for grid propagation --- salt/common/tools/sbin/so-user | 4 ++-- salt/elasticsearch/init.sls | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user index 7362c94a2..23034a6e9 100755 --- a/salt/common/tools/sbin/so-user +++ b/salt/common/tools/sbin/so-user @@ -40,8 +40,8 @@ email=$2 kratosUrl=${KRATOS_URL:-http://127.0.0.1:4434} databasePath=${KRATOS_DB_PATH:-/opt/so/conf/kratos/db/db.sqlite} bcryptRounds=${BCRYPT_ROUNDS:-12} -elasticUsersFile=${ELASTIC_USERS_FILE:-/opt/so/conf/elasticsearch/users} -elasticRolesFile=${ELASTIC_ROLES_FILE:-/opt/so/conf/elasticsearch/users_roles} +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} function fail() { msg=$1 diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index dd4af7696..5ee936f1c 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -174,8 +174,8 @@ syncesusers: cmd.run: - name: so-user sync - creates: - - /opt/so/conf/elasticsearch/users - - /opt/so/conf/elasticsearch/users_roles + - /opt/so/saltstack/local/salt/elasticsearch/files/users + - /opt/so/saltstack/local/salt/elasticsearch/files/users_roles so-elasticsearch: docker_container.running: