diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-02-24 08:47:33 -0500 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-04-13 07:00:57 -0400 |
| commit | 2ebbe3988bbc89401fbeedaa875de68e2f7aaed4 (patch) | |
| tree | ef24d633c5dd0a06b1bd39599cdcfd7d9a85f905 /nixos/modules/services/amqp | |
| parent | 7b2be9b328a469e3c31c5ff518bb9377d0d8c7ce (diff) | |
| download | nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar.gz nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar.bz2 nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar.lz nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar.xz nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.tar.zst nixpkgs-2ebbe3988bbc89401fbeedaa875de68e2f7aaed4.zip | |
nixos/rabbitmq: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/amqp')
| -rw-r--r-- | nixos/modules/services/amqp/rabbitmq.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 7373be2a9b0..302b94de196 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -179,11 +179,11 @@ in { } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; }; serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root ExecStart = "${cfg.package}/sbin/rabbitmq-server"; ExecStop = "${cfg.package}/sbin/rabbitmqctl shutdown"; User = "rabbitmq"; Group = "rabbitmq"; + LogsDirectory = "rabbitmq"; WorkingDirectory = cfg.dataDir; Type = "notify"; NotifyAccess = "all"; @@ -197,11 +197,8 @@ in { preStart = '' ${optionalString (cfg.cookie != "") '' echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie - chown rabbitmq:rabbitmq ${cfg.dataDir}/.erlang.cookie chmod 600 ${cfg.dataDir}/.erlang.cookie ''} - mkdir -p /var/log/rabbitmq - chown rabbitmq:rabbitmq /var/log/rabbitmq ''; }; |