diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2017-01-20 11:57:56 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2017-01-20 12:23:58 +0300 |
commit | 26d266fe9ef63622294bfe6f615e79906f988469 (patch) | |
tree | 9163a0c68becfde57c772b05ccac3be3bde60389 /modules/apps/mariadb/roles.nix | |
parent | d684a77fd887bf6a62a166f6ccc34501d614de3b (diff) | |
download | nixsap-26d266fe9ef63622294bfe6f615e79906f988469.tar.gz |
mariadb: use explicit package
Diffstat (limited to 'modules/apps/mariadb/roles.nix')
-rw-r--r-- | modules/apps/mariadb/roles.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/apps/mariadb/roles.nix b/modules/apps/mariadb/roles.nix index 0e10cf9..3ee7852 100644 --- a/modules/apps/mariadb/roles.nix +++ b/modules/apps/mariadb/roles.nix @@ -9,6 +9,8 @@ let inherit (types) attrsOf either listOf str submodule ; + cfg = config.nixsap.apps.mariadb; + explicit = filterAttrs (n: v: n != "_module" && v != null); inherit (config.nixsap.apps.mariadb) roles; @@ -127,13 +129,13 @@ let } while true; do - while ! mysql -e ';'; do + while ! ${cfg.package}/bin/mysql -e ';'; do sleep 5s done tmp=$(mktemp) trap 'rm -f "$tmp"' EXIT - mysql -N mysql < ${refreshRolesSQL} >> "$tmp" - mysql -v mysql < "$tmp" + ${cfg.package}/bin/mysql -N mysql < ${refreshRolesSQL} >> "$tmp" + ${cfg.package}/bin/mysql -v mysql < "$tmp" doze done ''; @@ -238,7 +240,6 @@ in { description = "refresh MariaDB basic roles"; after = [ "mariadb.service" "mariadb-maintenance.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.mariadb ]; serviceConfig = { ExecStart = "${refreshRoles}/bin/refreshRoles"; User = config.nixsap.apps.mariadb.user; |