alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/firebird: 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:10:08 -05:00
parent 4775c59528
commit 8034dac42f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/services/databases/firebird.nix
View file

@ -95,6 +95,11 @@ in
environment.systemPackages = [cfg.package]; environment.systemPackages = [cfg.package];
systemd.tmpfiles.rules = [
"d '${dataDir}' 0700 ${cfg.user} - - -"
"d '${systemDir}' 0700 ${cfg.user} - - -"
];
systemd.services.firebird = systemd.services.firebird =
{ description = "Firebird Super-Server"; { description = "Firebird Super-Server";
@ -104,21 +109,16 @@ in
# is a better way # is a better way
preStart = preStart =
'' ''
mkdir -m 0700 -p \
"${dataDir}" \
"${systemDir}" \
/var/log/firebird
if ! test -e "${systemDir}/security2.fdb"; then if ! test -e "${systemDir}/security2.fdb"; then
cp ${firebird}/security2.fdb "${systemDir}" cp ${firebird}/security2.fdb "${systemDir}"
fi fi
chown -R ${cfg.user} "${dataDir}" "${systemDir}" /var/log/firebird
chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird
''; '';
serviceConfig.PermissionsStartOnly = true; # preStart must be run as root
serviceConfig.User = cfg.user; serviceConfig.User = cfg.user;
serviceConfig.LogsDirectory = "firebird";
serviceConfig.LogsDirectoryMode = "0700";
serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d''; serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d'';
# TODO think about shutdown # TODO think about shutdown