summary refs log tree commit diff
path: root/nixos/modules/services/databases/memcached.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 07:35:04 -0500
committerAaron Andersen <aaron@fosslib.net>2019-04-13 07:00:55 -0400
commit2f50cd06dcbbf20aa2c5c0c339e6e10673839658 (patch)
tree41f533d19d99708c12d83f490ffca78026c568a3 /nixos/modules/services/databases/memcached.nix
parent5f9a639f692f30298e434d923a45ecdb22e9cf50 (diff)
downloadnixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar.gz
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar.bz2
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar.lz
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar.xz
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.tar.zst
nixpkgs-2f50cd06dcbbf20aa2c5c0c339e6e10673839658.zip
nixos/memcached: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/databases/memcached.nix')
-rw-r--r--nixos/modules/services/databases/memcached.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index 7af452e4dce..052ff1f308e 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -78,11 +78,6 @@ in
       after = [ "network.target" ];
 
       serviceConfig = {
-        PermissionsStartOnly = true;
-        ExecStartPre = optionals cfg.enableUnixSocket [
-          "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/"
-          "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/"
-        ];
         ExecStart =
         let
           networking = if cfg.enableUnixSocket
@@ -91,12 +86,13 @@ in
         in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
 
         User = cfg.user;
+        RuntimeDirectory = "memcached";
       };
     };
   };
   imports = [
     (mkRemovedOptionModule ["services" "memcached" "socket"] ''
-      This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket.
+      This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memcached.enableUnixSocket.
     '')
   ];