diff --git a/salt/postgres/config.sls b/salt/postgres/config.sls index f5bf856eb..e458e8455 100644 --- a/salt/postgres/config.sls +++ b/salt/postgres/config.sls @@ -94,14 +94,6 @@ postgres_app_secret: - require: - file: postgressecretsdir -postgrestelegrafrole: - file.managed: - - name: /usr/local/bin/telegraf_role.sh - - source: salt://postgres/files/telegraf_role.sh - - user: root - - group: root - - mode: 755 - postgres_sbin: file.recurse: - name: /usr/sbin diff --git a/salt/postgres/telegraf_users.sls b/salt/postgres/telegraf_users.sls index bafa781cc..369e30dbc 100644 --- a/salt/postgres/telegraf_users.sls +++ b/salt/postgres/telegraf_users.sls @@ -104,13 +104,13 @@ postgres_telegraf_group_role: postgres_telegraf_role_{{ u }}: cmd.run: - - name: /usr/local/bin/telegraf_role.sh + - name: /usr/sbin/telegraf_role.sh - env: - ROLE_USER: {{ u }} - ROLE_PASS: {{ p }} - hide_output: True - require: - - file: postgrestelegrafrole + - file: postgres_sbin - cmd: postgres_telegraf_group_role {% endif %} diff --git a/salt/postgres/files/telegraf_role.sh b/salt/postgres/tools/sbin/telegraf_role.sh similarity index 100% rename from salt/postgres/files/telegraf_role.sh rename to salt/postgres/tools/sbin/telegraf_role.sh