diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-02-23 16:53:57 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-04-13 07:00:58 -0400 |
commit | e51f86a018dfbe3514cd30f5d4cd1fa33a13a981 (patch) | |
tree | b6779a1056e6757e0d0f589686f1c0be6d333750 | |
parent | e5d8ba59cc3d5916fabc963f805ddd56a86d9cb1 (diff) | |
download | nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar.gz nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar.bz2 nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar.lz nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar.xz nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.tar.zst nixpkgs-e51f86a018dfbe3514cd30f5d4cd1fa33a13a981.zip |
nixos/clickhouse: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
-rw-r--r-- | nixos/modules/services/databases/clickhouse.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 21e0cee3415..dbabcae43ee 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: let cfg = config.services.clickhouse; - confDir = "/etc/clickhouse-server"; - stateDir = "/var/lib/clickhouse"; in with lib; { @@ -43,20 +41,13 @@ with lib; after = [ "network.target" ]; - preStart = '' - mkdir -p ${stateDir} - chown clickhouse:clickhouse ${confDir} ${stateDir} - ''; - - script = '' - cd "${confDir}" - exec ${pkgs.clickhouse}/bin/clickhouse-server - ''; - serviceConfig = { User = "clickhouse"; Group = "clickhouse"; - PermissionsStartOnly = true; + ConfigurationDirectory = "clickhouse-server"; + StateDirectory = "clickhouse"; + LogsDirectory = "clickhouse"; + ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml"; }; }; |