about summary refs log tree commit diff
path: root/pkgs/servers/monitoring
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
commitf65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch)
tree98bb48130a5c464418af19f314236e112ad20c55 /pkgs/servers/monitoring
parentb8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff)
parentffbb4d26f9f93681576815be82142d14f2aa8234 (diff)
downloadnixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.gz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.bz2
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.lz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.xz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.zst
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r--pkgs/servers/monitoring/zabbix/proxy.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 2062dc6659f8..48b72dc0590d 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -63,7 +63,10 @@ in
         mkdir -p $out/share/zabbix/database/
       '' + optionalString sqliteSupport ''
         mkdir -p $out/share/zabbix/database/sqlite3
-        cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/
+        cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/
+      '' + optionalString mysqlSupport ''
+        mkdir -p $out/share/zabbix/database/mysql
+        cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/
       '' + optionalString postgresqlSupport ''
         mkdir -p $out/share/zabbix/database/postgresql
         cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/