diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-02-24 16:23:57 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-05-26 07:20:57 -0400 |
commit | 65f449fe333ae24d9ea39928be8d28694a52c106 (patch) | |
tree | 79e92529bcde27f631d217157d653bd66dfe0cc3 | |
parent | 8034dac42fe97afe17f64d77d2b606b09384ddb3 (diff) | |
download | nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar.gz nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar.bz2 nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar.lz nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar.xz nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.tar.zst nixlib-65f449fe333ae24d9ea39928be8d28694a52c106.zip |
nixos/graylog: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
-rw-r--r-- | nixos/modules/services/logging/graylog.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 74a7b3c9b470..ee5668254981 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -134,6 +134,10 @@ in }; }; + systemd.tmpfiles.rules = [ + "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" + ]; + systemd.services.graylog = with pkgs; { description = "Graylog Server"; wantedBy = [ "multi-user.target" ]; @@ -143,8 +147,6 @@ in }; path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; preStart = '' - mkdir -p /var/lib/graylog -m 755 - rm -rf /var/lib/graylog/plugins || true mkdir -p /var/lib/graylog/plugins -m 755 @@ -154,14 +156,10 @@ in for includedplugin in `ls ${cfg.package}/plugin/`; do ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true done - chown -R ${cfg.user} /var/lib/graylog - - mkdir -p ${cfg.messageJournalDir} -m 755 - chown -R ${cfg.user} ${cfg.messageJournalDir} ''; serviceConfig = { User="${cfg.user}"; - PermissionsStartOnly=true; + StateDirectory = "graylog"; ExecStart = "${cfg.package}/bin/graylogctl run"; }; }; |