this repo has no description
some fixes and more work on the fluxer module, waiting for fixes on fluxer's side to continue
+24
-23
+5
-5
hosts/sand-archives/core/caddy.nix
+5
-5
hosts/sand-archives/core/caddy.nix
···
72
72
}
73
73
}
74
74
route @inner_http {
75
-
proxy 0.0.0.0:80
75
+
proxy ${pm.net.ipv4.vulpes.addr}:80
76
76
}
77
77
}
78
78
···
121
121
122
122
@local_https {
123
123
tls {
124
-
sni netbird.awoo.ren auth.awoo.ren syncthing.killuaa.dev
124
+
sni netbird.awoo.ren auth.awoo.ren syncthing.killuaa.dev *.code.awoo.ren
125
125
}
126
126
}
127
127
route @local_https {
···
134
134
}
135
135
}
136
136
route @inner_https {
137
-
proxy 0.0.0.0:443
137
+
proxy ${pm.net.ipv4.vulpes.addr}:443
138
138
}
139
139
}
140
140
141
141
udp/:5353 {
142
142
route {
143
-
proxy udp/0.0.0.0:5300
143
+
proxy udp/${pm.net.ipv4.vulpes.addr}:5300
144
144
}
145
145
}
146
146
147
147
tcp/:5353 {
148
148
route {
149
-
proxy tcp/0.0.0.0:5300
149
+
proxy tcp/${pm.net.ipv4.vulpes.addr}:5300
150
150
}
151
151
}
152
152
}
+1
hosts/vulpes/infra/pds.nix
+1
hosts/vulpes/infra/pds.nix
+10
-9
modules/pub/fluxer.nix
+10
-9
modules/pub/fluxer.nix
···
241
241
"postgresql-setup.service"
242
242
];
243
243
script = ''
244
-
${pkgs.fluxer_aggregate}/bin/aggregate-services/fluxer_migrations
244
+
${pkgs.fluxer_server}/bin/aggregate-services/fluxer_migrations
245
245
'';
246
246
serviceConfig = systemd_hardenning // {
247
247
Type = "simple";
···
259
259
};
260
260
};
261
261
262
-
fluxer_aggregate = {
262
+
fluxer_server = {
263
263
description = "Fluxer's aggregate";
264
264
wantedBy = [ "multi-user.target" ];
265
265
after = [
···
270
270
"meilisearch.service"
271
271
];
272
272
script = ''
273
-
${pkgs.fluxer_aggregate}/bin/fluxer_aggregate
273
+
${pkgs.fluxer_server}/bin/fluxer_aggregate
274
274
'';
275
275
serviceConfig = systemd_hardenning // {
276
276
Type = "simple";
277
277
StateDirectory = "${cfg.data_dir}";
278
278
ReadWritePaths = [ "${cfg.data_dir}" ];
279
-
BindPaths = [
280
-
"${pkgs.fluxer_ingress}/source:/build/source"
281
-
];
279
+
# BindPaths = [
280
+
# "${pkgs.fluxer_ingress}/source:/build/source"
281
+
# ];
282
282
Environment = base_env ++ [
283
283
"FLUXER_S3_ENDPOINT=http://127.0.0.1:8333"
284
284
"FLUXER_MEILISEARCH_URL=http://127.0.0.1:7702"
···
291
291
# THIS DISABLE'S LOCAL TLS FEATURES eventually should be fluxer.awoo.ren
292
292
# "FLUXER_INGRESS_DOMAIN=localhost"
293
293
"FLUXER_SPA_ENABLED=true"
294
-
"FLUXER_APP_ASSETS_DIR=${pkgs.fluxer_ingress}/assets"
295
-
"FLUXER_INGRESS_ROUTES_FILE=${pkgs.fluxer_ingress}/ingress-routes.json"
294
+
# "FLUXER_APP_ASSETS_DIR=${pkgs.fluxer_ingress}/assets"
295
+
# "FLUXER_INGRESS_ROUTES_FILE=${pkgs.fluxer_ingress}/ingress-routes.json"
296
296
"FLUXER_CSP_SCRIPT_ORIGINS=*"
297
297
"FLUXER_CSP_STYLE_ORIGINS=*"
298
298
"FLUXER_CSP_IMG_ORIGINS=*"
···
302
302
"FLUXER_CSP_FRAME_ORIGINS=*"
303
303
"FLUXER_CSP_WORKER_ORIGINS=*"
304
304
"FLUXER_CSP_MANIFEST_ORIGINS=*"
305
+
"RUST_BACKTRACE=1"
305
306
];
306
307
SupplementaryGroups = [
307
308
"fluxer"
···
314
315
wantedBy = [ "multi-user.target" ];
315
316
after = [
316
317
"network.target"
317
-
"fluxer_aggregate.service"
318
+
"fluxer_server.service"
318
319
"fluxer_migrate.service"
319
320
"nats.service"
320
321
];
+1
-1
overlays/default/overlay.nix
+1
-1
overlays/default/overlay.nix
···
2
2
(final: prev: rec {
3
3
calc-rs = prev.callPackage ../../packages/calc-rs { };
4
4
configarr = prev.callPackage ../../packages/configarr { };
5
-
fluxer_desktop = (import ../../packages/fluxer_nix).desktop;
5
+
fluxer_desktop = (import ../../packages/fluxer_nix_v2).desktop;
6
6
elysia = prev.callPackage ../../packages/elysia { };
7
7
safenet_authentication_client = prev.callPackage ../../packages/safenet_authentication_client { };
8
8
btrustbiss = prev.callPackage ../../packages/btrustbiss { inherit safenet_authentication_client; };
+6
-6
overlays/fluxer/default.nix
+6
-6
overlays/fluxer/default.nix
···
1
1
{ ... }:
2
2
let
3
-
path = ../../packages/fluxer_selfhost;
4
-
cranePath = ../../packages/fluxer_nix;
3
+
fluxer = (import ../../packages/fluxer_nix_v2);
5
4
in
6
5
(final: prev: {
7
-
fluxer_api = prev.callPackage (path + /api.nix) { };
8
-
fluxer_app = prev.callPackage (path + /app.nix) { };
9
-
fluxer_ingress = prev.callPackage (path + /ingress.nix) { };
10
-
fluxer_aggregate = ((import cranePath).aggregate_services);
6
+
# fluxer_api = prev.callPackage (path + /api.nix) { };
7
+
# fluxer_app = prev.callPackage (path + /app.nix) { };
8
+
# fluxer_ingress = prev.callPackage (path + /ingress.nix) { };
9
+
fluxer_server = fluxer.aggregate;
10
+
fluxer_api = fluxer.api;
11
11
})
+1
-2
vms/fluxer.nix
+1
-2
vms/fluxer.nix