Skip to content

Commit 13b31b2

Browse files
committed
fix(pgsql): fix pgsql import - pgsql fixes, defaults
1 parent 5c81ca1 commit 13b31b2

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

zabbix/defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,4 @@ zabbix:
7777
dbname: zabbix
7878
dbuser: zabbix
7979
dbpassword: zabbix
80+
sql_file: /usr/share/doc/zabbix-server-pgsql/create.sql.gz

zabbix/osfamilymap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ Suse:
167167
pgsql:
168168
pkgs:
169169
- postgresql
170+
- gzip
170171
sql_file: /usr/share/doc/packages/zabbix-server-pgsql/create.sql.gz
171172

172173

zabbix/pgsql/schema.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% set dbroot_user = settings.get('dbroot_user') -%}
1212
{% set dbroot_pass = settings.get('dbroot_pass') -%}
1313
14-
{% set sql_file = settings.get('sql_file', '/usr/share/doc/zabbix-server-pgsql/create.sql.gz') -%}
14+
{% set sql_file = settings.get('sql_file', defaults.sql_file) -%}
1515
1616
# Connection args required only if dbroot_user and dbroot_pass defined.
1717
{% set connection_args = {} -%}
@@ -51,7 +51,7 @@ upload_sql_dump:
5151
5252
import_sql:
5353
cmd.run:
54-
- name: zcat {{ sql_file }} | psql | head -5
54+
- name: zcat {{ sql_file }} | psql | { head -5; cat >/dev/null; }
5555
- runas: {{ zabbix.user }}
5656
- env:
5757
- PGUSER: {{ dbuser }}

0 commit comments

Comments
 (0)