Skip to content

Commit 2e7fe5b

Browse files
Updated repo with latest template
1 parent 5179793 commit 2e7fe5b

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

module.nix

+18-20
Original file line numberDiff line numberDiff line change
@@ -122,30 +122,27 @@ flake: {
122122
'';
123123
in "+${pkgs.writeShellScript "${manifest.name}-pre-start-full-privileges" preStartFullPrivileges}";
124124

125-
ExecStart = let
126-
inherit (lib) optionalString;
127-
in
128-
pkgs.writeShellScript "${manifest.name}-config" ''
129-
set -o errexit -o pipefail -o nounset
130-
shopt -s inherit_errexit
125+
ExecStart = pkgs.writeShellScript "${manifest.name}-config" ''
126+
set -o errexit -o pipefail -o nounset
127+
shopt -s inherit_errexit
131128
132-
umask u=rwx,g=rx,o=
129+
umask u=rwx,g=rx,o=
133130
134-
# Write configuration file for server
135-
cp -f ${toml-config} ${cfg.dataDir}/config.toml
131+
# Write configuration file for server
132+
cp -f ${toml-config} ${cfg.dataDir}/config.toml
136133
137-
${lib.optionalString cfg.database.socketAuth ''
138-
echo "DATABASE_URL=postgres://${cfg.database.user}@/${cfg.database.name}?host=${cfg.database.socket}" > "${cfg.dataDir}/.env"
139-
sed -i "s|#databaseUrl#|postgres://${cfg.database.user}@/${cfg.database.name}?host=${cfg.database.socket}|g" "${cfg.dataDir}/config.toml"
140-
''}
134+
${lib.optionalString cfg.database.socketAuth ''
135+
echo "DATABASE_URL=postgres://${cfg.database.user}@/${cfg.database.name}?host=${cfg.database.socket}" > "${cfg.dataDir}/.env"
136+
sed -i "s|#databaseUrl#|postgres://${cfg.database.user}@/${cfg.database.name}?host=${cfg.database.socket}|g" "${cfg.dataDir}/config.toml"
137+
''}
141138
142-
${lib.optionalString (!cfg.database.socketAuth) ''
143-
echo "DATABASE_URL=postgres://${cfg.database.user}:#password#@${cfg.database.host}/${cfg.database.name}" > "${cfg.dataDir}/.env"
144-
replace-secret '#password#' '${cfg.database.passwordFile}' '${cfg.dataDir}/.env'
145-
source "${cfg.dataDir}/.env"
146-
sed -i "s|#databaseUrl#|$DATABASE_URL|g" "${cfg.dataDir}/config.toml"
147-
''}
148-
'';
139+
${lib.optionalString (!cfg.database.socketAuth) ''
140+
echo "DATABASE_URL=postgres://${cfg.database.user}:#password#@${cfg.database.host}/${cfg.database.name}" > "${cfg.dataDir}/.env"
141+
replace-secret '#password#' '${cfg.database.passwordFile}' '${cfg.dataDir}/.env'
142+
source "${cfg.dataDir}/.env"
143+
sed -i "s|#databaseUrl#|$DATABASE_URL|g" "${cfg.dataDir}/config.toml"
144+
''}
145+
'';
149146
};
150147
};
151148

@@ -286,6 +283,7 @@ flake: {
286283
"AF_NETLINK"
287284
"AF_INET"
288285
"AF_INET6"
286+
"AF_UNIX"
289287
];
290288
RestrictNamespaces = true;
291289
RestrictRealtime = true;

0 commit comments

Comments
 (0)