diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-19 16:30:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 16:30:45 -0400 |
| commit | f882896cc88df506f9be36e5fdd5b07b4ae120f4 (patch) | |
| tree | ad506c98204c769c3582bfa61dfc1178d06c4a62 /nixos/modules | |
| parent | b3ae79263028c31107d286f04a2b8da127fd9282 (diff) | |
| parent | fe6dd71f72ad53f8556498f6c1fb97f4004df6d5 (diff) | |
| download | nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar.gz nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar.bz2 nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar.lz nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar.xz nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.tar.zst nixlib-f882896cc88df506f9be36e5fdd5b07b4ae120f4.zip | |
Merge pull request #73934 from flokli/nixos-test-port-cockroachdb
nixosTests.cockroachdb: port to python
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/databases/cockroachdb.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/ntp/chrony.nix | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index b6f94a4881a0..35fb46d69d8e 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -153,7 +153,7 @@ in defaultText = "pkgs.cockroachdb"; description = '' The CockroachDB derivation to use for running the service. - + This would primarily be useful to enable Enterprise Edition features in your own custom CockroachDB build (Nixpkgs CockroachDB binaries only contain open source features and open source code). diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index da9d960cc142..f1062edaa05b 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -92,6 +92,11 @@ in systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; }; + systemd.tmpfiles.rules = [ + "d ${stateDir} 0755 chrony chrony - -" + "f ${keyFile} 0640 chrony chrony -" + ]; + systemd.services.chronyd = { description = "chrony NTP daemon"; @@ -103,13 +108,6 @@ in path = [ pkgs.chrony ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - touch ${keyFile} - chmod 0640 ${keyFile} - chown chrony:chrony ${stateDir} ${keyFile} - ''; - unitConfig.ConditionCapability = "CAP_SYS_TIME"; serviceConfig = { Type = "simple"; @@ -118,7 +116,7 @@ in ProtectHome = "yes"; ProtectSystem = "full"; PrivateTmp = "yes"; - + StateDirectory = "chrony"; }; }; |