This repository has no description
module: add proper support for server.internalListenAddr
author
Cassie Cheung
date
(Mar 12, 2025, 3:58 AM +0800)
commit
95d90fdf
95d90fdfe0af17a5d6c86598439ea463cc1da646
parent
65442af0
65442af0969947cf2e6d7438c34c4b39fe2189d2
+21
-9
+4
-1
flake.lock
+4
-1
flake.lock
···
95
95
},
96
96
"root": {
97
97
"inputs": {
98
+
"nixpkgs": "nixpkgs",
98
99
"tangledCore": "tangledCore"
99
100
}
100
101
},
···
105
106
"ia-fonts-src": "ia-fonts-src",
106
107
"indigo": "indigo",
107
108
"lucide-src": "lucide-src",
108
-
"nixpkgs": "nixpkgs"
109
+
"nixpkgs": [
110
+
"nixpkgs"
111
+
]
109
112
},
110
113
"locked": {
111
114
"lastModified": 1741644644,
+17
-8
module.nix
+17
-8
module.nix
···
16
16
cfg = config.services.tangled-knotserver;
17
17
tangledPkgs = tangledFlake.packages.${pkgs.system};
18
18
19
-
keyfetchWrapper = pkgs.writeShellScriptBin {
20
-
name = "keyfetch-wrapper";
21
-
runtimeInputs = [ tangledPkgs.keyfetch ];
22
-
text = ''
23
-
keyfetch -repoguard-path ${lib.getExe tangledPkgs.repoguard} -log-path /tmp/repoguard.log
24
-
'';
25
-
};
19
+
wrapped-packages =
20
+
pkgs.runCommandCC "tangled-packages-wrapped" { nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; }
21
+
''
22
+
mkdir -p $out/bin
23
+
24
+
makeBinaryWrapper ${lib.getExe tangledPkgs.repoguard} $out/bin/repoguard \
25
+
--add-flags -internal-api=http://${cfg.server.internalListenAddr}
26
+
# other flags are set by keyfetch
27
+
28
+
makeBinaryWrapper ${lib.getExe tangledPkgs.keyfetch} $out/bin/keyfetch \
29
+
--add-flags "-repoguard-path=$out/bin/repoguard" \
30
+
--add-flags "-internal-api=http://${cfg.server.internalListenAddr}" \
31
+
--add-flags "-git-dir=${cfg.repo.scanPath}" \
32
+
--add-flags "-log-path=/tmp/repoguard.log"
33
+
'';
34
+
26
35
in
27
36
{
28
37
options = {
···
138
147
enable = true;
139
148
extraConfig = ''
140
149
Match User ${cfg.gitUser}
141
-
AuthorizedKeysCommand ${keyfetchWrapper}
150
+
AuthorizedKeysCommand ${lib.getExe' wrapped-packages "keyfetch"}
142
151
AuthorizedKeysCommandUser nobody
143
152
'';
144
153
};