soopy.moe
a more proper nixos module for the tangled knotserver
module: fixes, some improvements
+5
-5
+5
-5
module.nix
+5
-5
module.nix
···
21
21
''
22
22
mkdir -p $out/bin
23
23
24
-
makeBinaryWrapper ${lib.getExe tangledPkgs.repoguard} $out/bin/repoguard \
24
+
makeBinaryWrapper ${lib.getExe' tangledPkgs.repoguard "repoguard"} $out/bin/repoguard \
25
25
--add-flags -internal-api=http://${cfg.server.internalListenAddr}
26
26
# other flags are set by keyfetch
27
27
28
-
makeBinaryWrapper ${lib.getExe tangledPkgs.keyfetch} $out/bin/keyfetch \
28
+
makeBinaryWrapper ${lib.getExe' tangledPkgs.keyfetch "keyfetch"} $out/bin/keyfetch \
29
29
--add-flags "-repoguard-path=$out/bin/repoguard" \
30
30
--add-flags "-internal-api=http://${cfg.server.internalListenAddr}" \
31
31
--add-flags "-git-dir=${cfg.repo.scanPath}" \
···
138
138
};
139
139
};
140
140
141
-
config = mkIf config.enable {
141
+
config = mkIf cfg.enable {
142
142
warnings = optional cfg.server.dev ''
143
143
tangled-knotserver: development mode is enabled. This is not recommended in production as signature checks are disabled.
144
144
'';
···
178
178
serviceConfig = {
179
179
User = cfg.gitUser;
180
180
WorkingDirectory = cfg.repo.scanPath;
181
-
ExecStart = lib.getExe tangledPkgs.knotserver;
181
+
ExecStart = lib.getExe' tangledPkgs.knotserver "knotserver";
182
182
Restart = "always";
183
183
184
184
StateDirectory = mkIf (lib.hasPrefix "/var/lib/tangled-knotserver" cfg.repo.scanPath) "tangled-knotserver";
185
-
EnvironmentFile = cfg.environmentFile;
185
+
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
186
186
# TODO: hardening
187
187
};
188
188