mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
nixos/test/nominatim: replace activation script by ExecStartPre
See https://github.com/NixOS/nixpkgs/issues/475305
This commit is contained in:
@@ -59,14 +59,34 @@ in
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
# Database password
|
||||
system.activationScripts = {
|
||||
passwordFile.text = with config.services.nominatim.database; ''
|
||||
mkdir -p /run/secrets
|
||||
echo "${host}:${toString port}:${dbname}:${apiUser}:password" \
|
||||
> /run/secrets/pgpass
|
||||
chown nominatim-api:nominatim-api /run/secrets/pgpass
|
||||
chmod 0600 /run/secrets/pgpass
|
||||
'';
|
||||
systemd.services.nominatim = {
|
||||
serviceConfig.ExecStartPre =
|
||||
let
|
||||
createPasswordFile = lib.getExe (
|
||||
pkgs.writeShellApplication {
|
||||
name = "nominatim-pre-start";
|
||||
text =
|
||||
let
|
||||
inherit (config.services.nominatim.database)
|
||||
host
|
||||
port
|
||||
dbname
|
||||
apiUser
|
||||
;
|
||||
in
|
||||
''
|
||||
mkdir -p /run/secrets
|
||||
echo "${host}:${toString port}:${dbname}:${apiUser}:password" \
|
||||
> /run/secrets/pgpass
|
||||
chown nominatim-api:nominatim-api /run/secrets/pgpass
|
||||
chmod 0600 /run/secrets/pgpass
|
||||
'';
|
||||
}
|
||||
);
|
||||
in
|
||||
[
|
||||
"+${createPasswordFile}"
|
||||
];
|
||||
};
|
||||
|
||||
# Nominatim
|
||||
|
||||
Reference in New Issue
Block a user