diff options
author | Peter Simons <simons@cryp.to> | 2019-08-30 15:39:50 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2019-08-30 15:39:50 +0200 |
commit | 28dee92fffaa0745d9dce8a70623fa3f04885d08 (patch) | |
tree | feb7d8d8b414e37f85e28322c30fd5521892f97a /nixos/modules/services/databases | |
parent | 5a81797119c98758908f4c4b99f5f756481d3f39 (diff) | |
download | nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar.gz nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar.bz2 nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar.lz nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar.xz nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.tar.zst nixpkgs-28dee92fffaa0745d9dce8a70623fa3f04885d08.zip |
nixos/redis: move 'redis_init.service' into the preStart hook of 'redis.service'
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r-- | nixos/modules/services/databases/redis.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c04cc1283b2..3f2857100f5 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -224,26 +224,17 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.redis_init = - { description = "Redis Server Initialisation"; - - wantedBy = [ "redis.service" ]; - before = [ "redis.service" ]; - - serviceConfig.Type = "oneshot"; - - script = '' - install -d -m0700 -o ${cfg.user} ${cfg.dbpath} - chown -R ${cfg.user} ${cfg.dbpath} - ''; - }; - systemd.services.redis = { description = "Redis Server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + install -d -m0700 -o ${cfg.user} ${cfg.dbpath} + chown -R ${cfg.user} ${cfg.dbpath} + ''; + serviceConfig = { ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; User = cfg.user; |