Home

infra @main - refs - log -
-
https://git.jolheiser.com/infra.git
My NixOS infrastructure
tree log patch
flake: bump Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQNQLE7ZZUP88mXy6WjBGtj4hxw/bbdZ4vWnCLnqH1T0QrwKv7xcs8kGu5de3nBYpQm lioZwiC3BWKPa46sv0Dgk= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
3 hours ago
18 changed files, 136 additions(+), 124 deletions(-)
dragonwell/services/foundry.nixdragonwell/services/git-bug.nixdragonwell/services/miniserve.nixdragonwell/services/pubserve.nixdragonwell/services/ugit.nixdragonwell/services/woodpecker.nixdragonwell/services/zoekt.nixflake.lockflake.nixgunpowder/services/bazarr.nixgunpowder/services/jellyfin.nixgunpowder/services/prowlarr.nixgunpowder/services/qbittorrent.nixgunpowder/services/radarr.nixgunpowder/services/sonarr.nixshincha/services/beszel.nixshincha/services/mazanoke.nixshincha/services/oidc.nix
M dragonwell/services/foundry.nix -> dragonwell/services/foundry.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
diff --git a/dragonwell/services/foundry.nix b/dragonwell/services/foundry.nix
index b2c24d8bf71851d9e4d1231d2809985a5c972d93..ddbae2dae9389d45ec02ce3de735e78a02f19502 100644
--- a/dragonwell/services/foundry.nix
+++ b/dragonwell/services/foundry.nix
@@ -20,7 +20,9 @@       minifyStaticFiles = true;
       proxyPort = 443;
       proxySSL = true;
       upnp = false;
-      package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14;
+      package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14.overrideAttrs {
+        build = "367";
+      };
     };
     caddy.virtualHosts."${host}".extraConfig = ''
       reverse_proxy localhost:${builtins.toString port}
M dragonwell/services/git-bug.nix -> dragonwell/services/git-bug.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/dragonwell/services/git-bug.nix b/dragonwell/services/git-bug.nix
index 233629f6110537a4014d64910b9c7b5b9d3a9a84..c85e45e3a1effd31cd643e74de941853be48e7e9 100644
--- a/dragonwell/services/git-bug.nix
+++ b/dragonwell/services/git-bug.nix
@@ -16,9 +16,11 @@       inherit port;
     };
     tailproxy.bugs = {
       enable = true;
-      hostname = "bugs";
-      inherit port;
-      authKey = ""; # One-time key
+      settings = {
+        hostname = "bugs";
+        inherit port;
+        auth-key = ""; # One-time key
+      };
     };
   };
 }
M dragonwell/services/miniserve.nix -> dragonwell/services/miniserve.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/dragonwell/services/miniserve.nix b/dragonwell/services/miniserve.nix
index 3b9d28fd12071bc0d25f9825334a8e751a5fcbe2..43a867ddf37551c43698fec0292f37684f72cd69 100644
--- a/dragonwell/services/miniserve.nix
+++ b/dragonwell/services/miniserve.nix
@@ -23,9 +23,11 @@       readme = true;
     };
     tailproxy.miniserve = {
       enable = true;
-      hostname = "files";
-      inherit port;
-      authKey = "tskey-auth-kNNZJXfSDb11CNTRL-DsdZPygdA7Lrye5WJjnr6LGNffgzo3PUH"; # One-time key
+      settings = {
+        hostname = "files";
+        inherit port;
+        auth-key = "tskey-auth-kNNZJXfSDb11CNTRL-DsdZPygdA7Lrye5WJjnr6LGNffgzo3PUH"; # One-time key
+      };
     };
   };
 }
M dragonwell/services/pubserve.nix -> dragonwell/services/pubserve.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
diff --git a/dragonwell/services/pubserve.nix b/dragonwell/services/pubserve.nix
index 41cd7eddaa4780f2a592bae7401df7e5cdcbb3ad..ffe9023f6c5844a030957f2d4065bf9a3251fcdf 100644
--- a/dragonwell/services/pubserve.nix
+++ b/dragonwell/services/pubserve.nix
@@ -56,16 +56,20 @@     };
   services.tailproxy = {
     pubserve = {
       enable = true;
-      hostname = "pubserve";
-      funnel = true;
-      port = pubPort;
-      authKey = "tskey-auth-kJrnknpMsL11CNTRL-ot1kkasErR2cLZZmfuKYR2b9za7fCzVR"; # One-time key
+      settings = {
+        hostname = "pubserve";
+        funnel = true;
+        port = pubPort;
+        auth-key = "tskey-auth-kJrnknpMsL11CNTRL-ot1kkasErR2cLZZmfuKYR2b9za7fCzVR"; # One-time key
+      };
     };
     privserve = {
       enable = true;
-      hostname = "privserve";
-      port = privPort;
-      authKey = "tskey-auth-kKFv865ykk11CNTRL-dfmxUREHP5evuuMsfPy55ehXECXrLF1N7"; # One-time key
+      settings = {
+        hostname = "privserve";
+        port = privPort;
+        auth-key = "tskey-auth-kKFv865ykk11CNTRL-dfmxUREHP5evuuMsfPy55ehXECXrLF1N7"; # One-time key
+      };
     };
   };
 }
M dragonwell/services/ugit.nix -> dragonwell/services/ugit.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/dragonwell/services/ugit.nix b/dragonwell/services/ugit.nix
index f2b452edc30b85011aaffe2c0eb66bf6a19cf1ba..c63903bc0ca7aab33e94e239a13583308f9f0095 100644
--- a/dragonwell/services/ugit.nix
+++ b/dragonwell/services/ugit.nix
@@ -60,9 +60,11 @@       };
     };
     tailproxy.ugit = {
       enable = true;
-      hostname = "git";
-      port = privPort;
-      authKey = "tskey-auth-kyuvaLt8pb11CNTRL-admMYrs6UWb5XaCcdWJAWbriZ6JMo7ksK"; # One-time key
+      settings = {
+        hostname = "git";
+        port = privPort;
+        auth-key = "tskey-auth-kyuvaLt8pb11CNTRL-admMYrs6UWb5XaCcdWJAWbriZ6JMo7ksK"; # One-time key
+      };
     };
     caddy.virtualHosts."${host}".extraConfig = ''
       reverse_proxy localhost:${builtins.toString pubPort}
M dragonwell/services/woodpecker.nix -> dragonwell/services/woodpecker.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/dragonwell/services/woodpecker.nix b/dragonwell/services/woodpecker.nix
index 549f05111a3007243f773ab2bc58485c6eed3cf1..b7a27e89dbb66630353e7f6ffa79a3972b04a35b 100644
--- a/dragonwell/services/woodpecker.nix
+++ b/dragonwell/services/woodpecker.nix
@@ -51,9 +51,11 @@       environmentFile = [ config.age.secrets.woodpecker.path ];
     };
     tailproxy.woodpecker = {
       enable = true;
-      hostname = "cicd";
-      inherit port;
-      authKey = "tskey-auth-kgrGNGArZw11CNTRL-rA3rdahB1dEobvWZraPhcEpHp2BVBcYh"; # One-time key
+      settings = {
+        hostname = "cicd";
+        inherit port;
+        auth-key = "tskey-auth-kgrGNGArZw11CNTRL-rA3rdahB1dEobvWZraPhcEpHp2BVBcYh"; # One-time key
+      };
     };
   };
   systemd.services.woodpecker-server.serviceConfig.SupplementaryGroups = [ "ugit" ];
M dragonwell/services/zoekt.nix -> dragonwell/services/zoekt.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/dragonwell/services/zoekt.nix b/dragonwell/services/zoekt.nix
index 45597776ca1b81ba3ac8d37aa6cd88374859e8fe..7025b4602ec47c3a4dbd1bd702e75fdf73d9c8d5 100644
--- a/dragonwell/services/zoekt.nix
+++ b/dragonwell/services/zoekt.nix
@@ -9,9 +9,11 @@ in
 lib.mkIf enable {
   services.tailproxy.zoekt = {
     enable = true;
-    hostname = "zoekt";
-    inherit port;
-    authKey = "tskey-auth-k4SpytYDoS11CNTRL-Aeeu3nNJZVChryEPXr8sVCpYykMtUfZh"; # One-time key
+    settings = {
+      hostname = "zoekt";
+      inherit port;
+      auth-key = "tskey-auth-k4SpytYDoS11CNTRL-Aeeu3nNJZVChryEPXr8sVCpYykMtUfZh"; # One-time key
+    };
   };
   systemd = {
     services = {
M flake.lock -> flake.lock
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
diff --git a/flake.lock b/flake.lock
index 5a5cb4e37a7a0395be195e1135b3bda9d92e9f59..21e726c7274a3da09ebaaadf794c19ef0083b7e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,19 +2,16 @@ {
   "nodes": {
     "agenix": {
       "inputs": {
-        "darwin": [],
-        "home-manager": [],
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "systems": "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1770165109,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
+        "lastModified": 1792507013,
+        "narHash": "sha256-8tKjSQajD3mUND1GaAuaWTcuyUpgcGsh5V+l4ibzC7U=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
+        "rev": "5e5b88a0c8e56f291a108c2fe9934054d9745b2e",
         "type": "github"
       },
       "original": {
@@ -120,11 +117,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1787480085,
-        "narHash": "sha256-5+tysEBBKJ4BD37yDdjlMX60MLoE9giHezdLcWSlhpw=",
+        "lastModified": 1794172055,
+        "narHash": "sha256-B3jjBr6nPjyiiQpVjQN0opU9XH8HMEG39obNFlsuFG0=",
         "owner": "reckenrode",
         "repo": "nix-foundryvtt",
-        "rev": "2f1ce6e4dfd2b4379179a118c70ebd6931d22e61",
+        "rev": "f20f57bb17e9b98e54cffa1f63f1dacc018d5eda",
         "type": "github"
       },
       "original": {
@@ -180,11 +177,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1784733284,
-        "narHash": "sha256-8eZKDmdsja84P7of4Rw0HkfQw8arAvdWV+9shhdcUiA=",
+        "lastModified": 1791394568,
+        "narHash": "sha256-hs2x0NJMR7Ab22SEXxu4W23QuvwRhq2pus6JUCfIuaM=",
         "ref": "refs/heads/main",
-        "rev": "fbb13e18040c034192845f688a78176b5152b661",
-        "revCount": 5,
+        "rev": "551ed52edc36612da8a63e65cf776afd2d730f53",
+        "revCount": 6,
         "type": "git",
         "url": "https://git.jolheiser.com/gitpecker.git"
       },
@@ -196,14 +193,14 @@     },
     "golink": {
       "inputs": {
         "nixpkgs": "nixpkgs_8",
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1787241322,
-        "narHash": "sha256-RUS9EtnG0VwRzOV0a0f8vC1nxpjSRONSHdLaQ2Z5aUE=",
+        "lastModified": 1794326209,
+        "narHash": "sha256-X5fYBAIoROVXgWy44zvESG9FX2S9stXqfc04BncyQUY=",
         "owner": "tailscale",
         "repo": "golink",
-        "rev": "3f9300f2b03f29f1a2eb704ff419d849f47aabf4",
+        "rev": "d4c752ba2a71793dd8035a5b23746f2c97831c89",
         "type": "github"
       },
       "original": {
@@ -235,11 +232,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
-        "lastModified": 1778508921,
-        "narHash": "sha256-Tqxo8ei60iU8fF2CqpDO4h4Kte8Krs0FpMxPMk6JriM=",
+        "lastModified": 1790175771,
+        "narHash": "sha256-GwyELHI8kLTWTd1jFJuT9TWlRNqXe3kpngp+lvx7H8U=",
         "owner": "jolheiser",
         "repo": "mazanoke-nix",
-        "rev": "c707b6094ae0ce529f4fd9b0783e3913fc797e67",
+        "rev": "c54676dceef639d59b075a344d2783e519ebadee",
         "type": "github"
       },
       "original": {
@@ -331,11 +328,11 @@       }
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1788752844,
-        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
+        "lastModified": 1794890597,
+        "narHash": "sha256-lME2lHoDHAaSHP3/okgiVoJ0icVEvsQH8LeU3We7tcc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
+        "rev": "04906337b6d53e8bb0eaf0470ae9f070a4d4eb55",
         "type": "github"
       },
       "original": {
@@ -378,11 +375,11 @@       }
     },
     "nixpkgs_15": {
       "locked": {
-        "lastModified": 1788922888,
-        "narHash": "sha256-QMX3uerxnW2R5dHcWpIQILHDltOZnon3x3Spq7EzBFI=",
+        "lastModified": 1794840529,
+        "narHash": "sha256-ySrWnmZB5UsZTYGHHnBjllT05O5iFjElCRS+mabtfP0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a391f95d4557d685fd8e5dc0d4b1f9271aa2f342",
+        "rev": "e21fec321d73511849707a7585e4ea155ee4bf40",
         "type": "github"
       },
       "original": {
@@ -394,11 +391,11 @@       }
     },
     "nixpkgs_16": {
       "locked": {
-        "lastModified": 1786599213,
-        "narHash": "sha256-yjGG65gA1jORt0hWxjzrnw3AYkIn8EWolp8vezwXZ3I=",
-        "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
+        "lastModified": 1792502884,
+        "narHash": "sha256-ij8QUxzTOHovLrNOxVRx+RAhGQFOMsJbji0veiatH5k=",
+        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1053317.0e251e24a4f2/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1097682.02c087f3fe67/nixexprs.tar.zst"
       },
       "original": {
         "id": "nixpkgs",
@@ -568,16 +565,16 @@       }
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1787101114,
-        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
+        "lastModified": 1792502884,
+        "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-26.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -660,11 +657,11 @@       }
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1791244623,
+        "narHash": "sha256-uuanbkFk8a313Zfrxdcz8Us/yQtaxNnKJtX8v0ZPpd8=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "d36eeed142f88b5a636f2e3856a53c61654cf29b",
         "type": "github"
       },
       "original": {
@@ -688,31 +685,16 @@         "repo": "default",
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tailproxy": {
       "inputs": {
         "nixpkgs": "nixpkgs_15"
       },
       "locked": {
-        "lastModified": 1788990254,
-        "narHash": "sha256-ej3xb8RXdvKc7sSZHDgmW9qQ0lJ1OFBydcHH9F4+v3k=",
+        "lastModified": 1795039117,
+        "narHash": "sha256-ZzFcYWqhEIWSulQplC9qQ/h+zX9z5NqocKo6BDsU940=",
         "ref": "refs/heads/main",
-        "rev": "30dd218b0c64383cc437557066f916d4b9e9fdfe",
-        "revCount": 9,
+        "rev": "94680dfaae2286d62f9da4e1b491c11a3cbad85d",
+        "revCount": 11,
         "type": "git",
         "url": "https://git.jolheiser.com/tailroute.git"
       },
@@ -805,11 +787,11 @@         "nixpkgs": "nixpkgs_16",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1786713929,
-        "narHash": "sha256-ZKysiy4mJm3/VkEWCkZWuJuATdYkAiURmf1yVVwfKdQ=",
+        "lastModified": 1792588702,
+        "narHash": "sha256-sNtJnP3LAhSVktVJKcHC0brF95DNbn3n+lEgtMsQt1Q=",
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "rev": "da4dd37bb76afc594b20e329484cd8cfe58f7cd4",
+        "rev": "bfe0827247ecb99105753f8fb8a903abf11d0a27",
         "type": "github"
       },
       "original": {
@@ -840,14 +822,14 @@       }
     },
     "utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1791914995,
+        "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
         "type": "github"
       },
       "original": {
@@ -858,11 +840,11 @@       }
     },
     "vpn-confinement": {
       "locked": {
-        "lastModified": 1788035501,
-        "narHash": "sha256-3Xs9lCMwjvFURU7/fPEGDR5kCKvcdX2l5Fah1nZoaGQ=",
+        "lastModified": 1794523109,
+        "narHash": "sha256-AwEm7+NWkEgyZsKLlR3a0qU/V0uIirwCuxSLpmAiufA=",
         "owner": "Maroka-chan",
         "repo": "VPN-Confinement",
-        "rev": "ce8949125b698406810ea71a8bd7b567d9a0b09f",
+        "rev": "eeab5446fdbba273905da915805db665524abda6",
         "type": "github"
       },
       "original": {
M flake.nix -> flake.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
diff --git a/flake.nix b/flake.nix
index d6857e274ab6e3df388467de5bd21ea648d0208d..d23939a6bc0f212288d34959ec56dd757138be6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,11 +5,7 @@   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     agenix = {
       url = "github:ryantm/agenix";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        darwin.follows = "";
-        home-manager.follows = "";
-      };
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     website.url = "git+https://git.jolheiser.com/jolheiser.com.git";
     resume.url = "git+https://git.jolheiser.com/resume.git";
M gunpowder/services/bazarr.nix -> gunpowder/services/bazarr.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/gunpowder/services/bazarr.nix b/gunpowder/services/bazarr.nix
index 9a1ea19bd78afc4f5576f652b8939a5f9cc360fe..422e49f5885d078524ac1a5d76ec41d6c9a9e3c5 100644
--- a/gunpowder/services/bazarr.nix
+++ b/gunpowder/services/bazarr.nix
@@ -10,9 +10,11 @@       openFirewall = true;
     };
     tailproxy.bazarr = {
       enable = true;
-      hostname = "bazarr";
-      port = 6767;
-      authKey = "tskey-auth-kydeAt7KDA21CNTRL-bLfZMG4ip4i4a91DX1b85ipjnZi9KgoN9"; # One-time key
+      settings = {
+        hostname = "bazarr";
+        port = 6767;
+        auth-key = "tskey-auth-kydeAt7KDA21CNTRL-bLfZMG4ip4i4a91DX1b85ipjnZi9KgoN9"; # One-time key
+      };
     };
   };
 }
M gunpowder/services/jellyfin.nix -> gunpowder/services/jellyfin.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/gunpowder/services/jellyfin.nix b/gunpowder/services/jellyfin.nix
index 2f8374d7eefd66c06e0c231a4aec3caee7007bde..78b0f68d51ee6e4aa2df653cb60c72bfbecbc271 100644
--- a/gunpowder/services/jellyfin.nix
+++ b/gunpowder/services/jellyfin.nix
@@ -10,9 +10,11 @@       openFirewall = true;
     };
     tailproxy.jellyfin = {
       enable = true;
-      hostname = "jellyfin";
-      port = 8096;
-      authKey = "tskey-auth-khZwt3ASDX11CNTRL-jYDAVuX7VVLCebLUGdvnVLLoUkeEevXEV"; # One-time key
+      settings = {
+        hostname = "jellyfin";
+        port = 8096;
+        auth-key = "tskey-auth-khZwt3ASDX11CNTRL-jYDAVuX7VVLCebLUGdvnVLLoUkeEevXEV"; # One-time key
+      };
     };
   };
   users.groups.media.members = [ "jellyfin" ];
M gunpowder/services/prowlarr.nix -> gunpowder/services/prowlarr.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/gunpowder/services/prowlarr.nix b/gunpowder/services/prowlarr.nix
index d3dc752b8e133ca10dcd9e01dd9ae0ca99179811..79b04c1d8fbca51619f6fe65afac918ee955aecb 100644
--- a/gunpowder/services/prowlarr.nix
+++ b/gunpowder/services/prowlarr.nix
@@ -10,9 +10,11 @@       openFirewall = true;
     };
     tailproxy.prowlarr = {
       enable = true;
-      hostname = "prowlarr";
-      port = 9696;
-      authKey = "tskey-auth-koCbGEVEvh11CNTRL-7pxqVBdP4v5xNvsPP5mMv5oW8PrgVQmb"; # One-time key
+      settings = {
+        hostname = "prowlarr";
+        port = 9696;
+        auth-key = "tskey-auth-koCbGEVEvh11CNTRL-7pxqVBdP4v5xNvsPP5mMv5oW8PrgVQmb"; # One-time key
+      };
     };
   };
 }
M gunpowder/services/qbittorrent.nix -> gunpowder/services/qbittorrent.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/gunpowder/services/qbittorrent.nix b/gunpowder/services/qbittorrent.nix
index cb1d8a6b7486ca54ba1abadd56654c3bb00b8399..eebd1c346f51e4213a8746e2087f51a81e97a2d7 100644
--- a/gunpowder/services/qbittorrent.nix
+++ b/gunpowder/services/qbittorrent.nix
@@ -30,10 +30,12 @@       webuiPort = port;
     };
     tailproxy.qbittorrent = {
       enable = true;
-      hostname = "qbittorrent";
-      host = config.vpnNamespaces.mullvad.namespaceAddress;
-      inherit port;
-      authKey = "tskey-auth-kV7j5FHHHh11CNTRL-wPSNdNQqza8kXxzpnZXha8B7JCvdwCAy"; # One-time key
+      settings = {
+        hostname = "qbittorrent";
+        host = config.vpnNamespaces.mullvad.namespaceAddress;
+        inherit port;
+        auth-key = "tskey-auth-kV7j5FHHHh11CNTRL-wPSNdNQqza8kXxzpnZXha8B7JCvdwCAy"; # One-time key
+      };
     };
   };
 }
M gunpowder/services/radarr.nix -> gunpowder/services/radarr.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/gunpowder/services/radarr.nix b/gunpowder/services/radarr.nix
index 14afd26fb07ff5782d5fc1569f403ab03cd997c3..d4075690a4cf0d9872b8f2d87bfdb703c3c12eef 100644
--- a/gunpowder/services/radarr.nix
+++ b/gunpowder/services/radarr.nix
@@ -10,9 +10,11 @@       openFirewall = true;
     };
     tailproxy.radarr = {
       enable = true;
-      hostname = "radarr";
-      port = 7878;
-      authKey = "tskey-auth-kjuWphWmFp11CNTRL-dcpVCTbdPTAAiqQHaKVhTA27uNQeHxmq5"; # One-time key
+      settings = {
+        hostname = "radarr";
+        port = 7878;
+        auth-key = "tskey-auth-kjuWphWmFp11CNTRL-dcpVCTbdPTAAiqQHaKVhTA27uNQeHxmq5"; # One-time key
+      };
     };
   };
   users.groups.media.members = [ "radarr" ];
M gunpowder/services/sonarr.nix -> gunpowder/services/sonarr.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/gunpowder/services/sonarr.nix b/gunpowder/services/sonarr.nix
index 7ff6f9354eec58dac82b181cb6458a26736e993d..93edbdc5fecd8f5bf947ea55f7f4fe376ae3d948 100644
--- a/gunpowder/services/sonarr.nix
+++ b/gunpowder/services/sonarr.nix
@@ -10,9 +10,11 @@       openFirewall = true;
     };
     tailproxy.sonarr = {
       enable = true;
-      hostname = "sonarr";
-      port = 8989;
-      authKey = "tskey-auth-k1mZ4587A511CNTRL-uxq54KBAvb6YuhvZbxscb6rf7x8UwNiP"; # One-time key
+      settings = {
+        hostname = "sonarr";
+        port = 8989;
+        auth-key = "tskey-auth-k1mZ4587A511CNTRL-uxq54KBAvb6YuhvZbxscb6rf7x8UwNiP"; # One-time key
+      };
     };
   };
   users.groups.media.members = [ "sonarr" ];
M shincha/services/beszel.nix -> shincha/services/beszel.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/shincha/services/beszel.nix b/shincha/services/beszel.nix
index 2dabfc532355111581407a80a8daabbdff161fa2..b73b0388c32f9c96adbfb3c3775c96c18d600d7b 100644
--- a/shincha/services/beszel.nix
+++ b/shincha/services/beszel.nix
@@ -22,9 +22,11 @@       };
     };
     tailproxy.beszel = {
       enable = true;
-      hostname = host;
-      authKey = "tskey-auth-krRJB4JVL321CNTRL-Vfaa8HZwsVXzTU4MUAnBWXsZMCcFbrLVe"; # One-time key
-      port = 8090;
+      settings = {
+        hostname = host;
+        auth-key = "tskey-auth-krRJB4JVL321CNTRL-Vfaa8HZwsVXzTU4MUAnBWXsZMCcFbrLVe"; # One-time key
+        port = 8090;
+      };
     };
   };
 }
M shincha/services/mazanoke.nix -> shincha/services/mazanoke.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/shincha/services/mazanoke.nix b/shincha/services/mazanoke.nix
index 7c89e1e3e984d0208d48941605bc6b4555d91b56..9c729d815075be510b7cdf2b358002e600c2df0c 100644
--- a/shincha/services/mazanoke.nix
+++ b/shincha/services/mazanoke.nix
@@ -7,10 +7,12 @@   services = {
     mazanoke.enable = true;
     tailproxy.mazanoke = {
       enable = true;
-      hostname = "img";
-      authKey = "tskey-auth-kN76twaVyw11CNTRL-aUgvGLQsBSjuJ94BgsDVSjRhTGCmXAmi"; # One-time key
-      funnel = true;
-      port = 6292;
+      settings = {
+        hostname = "img";
+        auth-key = "tskey-auth-kN76twaVyw11CNTRL-aUgvGLQsBSjuJ94BgsDVSjRhTGCmXAmi"; # One-time key
+        funnel = true;
+        port = 6292;
+      };
     };
   };
 }
M shincha/services/oidc.nix -> shincha/services/oidc.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
diff --git a/shincha/services/oidc.nix b/shincha/services/oidc.nix
index 0f8712e74e2bf5b630e96e9132cbe939fb609bd1..36e8eec437da15ab67d3008d03eb5ca971822158 100644
--- a/shincha/services/oidc.nix
+++ b/shincha/services/oidc.nix
@@ -11,9 +11,11 @@       origin = "https://${host}";
     };
     tailproxy.oidc-playground = {
       enable = true;
-      hostname = host;
-      authKey = "tskey-auth-kkFJ2NFkCX11CNTRL-Doq9XTGfm9Vxn8nb6QQU9VjmAh6ZFgih"; # One-time key
-      port = 6432;
+      settings = {
+        hostname = host;
+        auth-key = "tskey-auth-kkFJ2NFkCX11CNTRL-Doq9XTGfm9Vxn8nb6QQU9VjmAh6ZFgih"; # One-time key
+        port = 6432;
+      };
     };
   };
 }