public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/graylog: replace deprecated usage of PermissionsStartOnly

Browse Source 
see https://github.com/NixOS/nixpkgs/issues/53852
This commit is contained in:
Aaron Andersen 2019-02-24 16:23:57 -05:00
parent 8034dac42f
commit 65f449fe33
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/logging/graylog.nix
View File

@ -134,6 +134,10 @@ in
}; };
}; };
systemd.tmpfiles.rules = [
"d '${cfg.messageJournalDir}' - ${cfg.user} - - -"
];
systemd.services.graylog = with pkgs; { systemd.services.graylog = with pkgs; {
description = "Graylog Server"; description = "Graylog Server";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -143,8 +147,6 @@ in
}; };
path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
preStart = '' preStart = ''
mkdir -p /var/lib/graylog -m 755
rm -rf /var/lib/graylog/plugins || true rm -rf /var/lib/graylog/plugins || true
mkdir -p /var/lib/graylog/plugins -m 755 mkdir -p /var/lib/graylog/plugins -m 755
@ -154,14 +156,10 @@ in
for includedplugin in `ls ${cfg.package}/plugin/`; do for includedplugin in `ls ${cfg.package}/plugin/`; do
ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true
done done
chown -R ${cfg.user} /var/lib/graylog
mkdir -p ${cfg.messageJournalDir} -m 755
chown -R ${cfg.user} ${cfg.messageJournalDir}
''; '';
serviceConfig = { serviceConfig = {
User="${cfg.user}"; User="${cfg.user}";
PermissionsStartOnly=true; StateDirectory = "graylog";
ExecStart = "${cfg.package}/bin/graylogctl run"; ExecStart = "${cfg.package}/bin/graylogctl run";
}; };
}; };