fix(pgsql): fix pgsql import - guaranteed user, don't end psql too soon

saltstack-formulas · Apr 16, 2021 · 224b87c · 224b87c
1 parent 5c81ca1
commit 224b87c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zabbix/pgsql/schema.sls b/zabbix/pgsql/schema.sls
@@ -16,7 +16,7 @@
 # Connection args required only if dbroot_user and dbroot_pass defined.
 {% set connection_args = {} -%}
 {% if dbroot_user and dbroot_pass -%}
-{%  set connection_args = {'runas': 'nobody', 'host': dbhost, 'user': dbroot_user, 'password': dbroot_pass} -%}
+{%  set connection_args = {'runas': zabbix.user, 'host': dbhost, 'user': dbroot_user, 'password': dbroot_pass} -%}
 {% endif -%}
 
 # Check is there any tables in database.
@@ -51,7 +51,7 @@ upload_sql_dump:
 
 import_sql:
   cmd.run:
-    - name: zcat {{ sql_file }} | psql | head -5
+    - name: zcat {{ sql_file }} | psql | { head -5; cat >/dev/null; }
     - runas: {{ zabbix.user }}
     - env:
       - PGUSER: {{ dbuser }}