diff --git a/hosts/sand-archives/core/caddy.nix b/hosts/sand-archives/core/caddy.nix index 923a24a..149b5a2 100644 --- a/hosts/sand-archives/core/caddy.nix +++ b/hosts/sand-archives/core/caddy.nix @@ -72,7 +72,7 @@ in } } route @inner_http { - proxy 0.0.0.0:80 + proxy ${pm.net.ipv4.vulpes.addr}:80 } } @@ -121,7 +121,7 @@ in @local_https { tls { - sni netbird.awoo.ren auth.awoo.ren syncthing.killuaa.dev + sni netbird.awoo.ren auth.awoo.ren syncthing.killuaa.dev *.code.awoo.ren } } route @local_https { @@ -134,19 +134,19 @@ in } } route @inner_https { - proxy 0.0.0.0:443 + proxy ${pm.net.ipv4.vulpes.addr}:443 } } udp/:5353 { route { - proxy udp/0.0.0.0:5300 + proxy udp/${pm.net.ipv4.vulpes.addr}:5300 } } tcp/:5353 { route { - proxy tcp/0.0.0.0:5300 + proxy tcp/${pm.net.ipv4.vulpes.addr}:5300 } } } diff --git a/hosts/vulpes/infra/pds.nix b/hosts/vulpes/infra/pds.nix index 5d38d93..5bd4651 100644 --- a/hosts/vulpes/infra/pds.nix +++ b/hosts/vulpes/infra/pds.nix @@ -11,6 +11,7 @@ in settings = { server = { hostname = "pds.awoo.ren"; + host = "0.0.0.0"; port = 3892; user_handle_domains = [ "awoo.ren" ]; available_user_domains = [ "awoo.ren" ]; diff --git a/modules/priv b/modules/priv index baf52fe..81347f4 160000 --- a/modules/priv +++ b/modules/priv @@ -1 +1 @@ -Subproject commit baf52fe10bee392adf89dbac6ae8ee4def60eb6b +Subproject commit 81347f4dfb5e211d695c92bd6e0ebb4618285270 diff --git a/modules/pub/fluxer.nix b/modules/pub/fluxer.nix index 6d32678..c33a4e6 100644 --- a/modules/pub/fluxer.nix +++ b/modules/pub/fluxer.nix @@ -241,7 +241,7 @@ in "postgresql-setup.service" ]; script = '' - ${pkgs.fluxer_aggregate}/bin/aggregate-services/fluxer_migrations + ${pkgs.fluxer_server}/bin/aggregate-services/fluxer_migrations ''; serviceConfig = systemd_hardenning // { Type = "simple"; @@ -259,7 +259,7 @@ in }; }; - fluxer_aggregate = { + fluxer_server = { description = "Fluxer's aggregate"; wantedBy = [ "multi-user.target" ]; after = [ @@ -270,15 +270,15 @@ in "meilisearch.service" ]; script = '' - ${pkgs.fluxer_aggregate}/bin/fluxer_aggregate + ${pkgs.fluxer_server}/bin/fluxer_aggregate ''; serviceConfig = systemd_hardenning // { Type = "simple"; StateDirectory = "${cfg.data_dir}"; ReadWritePaths = [ "${cfg.data_dir}" ]; - BindPaths = [ - "${pkgs.fluxer_ingress}/source:/build/source" - ]; + # BindPaths = [ + # "${pkgs.fluxer_ingress}/source:/build/source" + # ]; Environment = base_env ++ [ "FLUXER_S3_ENDPOINT=http://127.0.0.1:8333" "FLUXER_MEILISEARCH_URL=http://127.0.0.1:7702" @@ -291,8 +291,8 @@ in # THIS DISABLE'S LOCAL TLS FEATURES eventually should be fluxer.awoo.ren # "FLUXER_INGRESS_DOMAIN=localhost" "FLUXER_SPA_ENABLED=true" - "FLUXER_APP_ASSETS_DIR=${pkgs.fluxer_ingress}/assets" - "FLUXER_INGRESS_ROUTES_FILE=${pkgs.fluxer_ingress}/ingress-routes.json" + # "FLUXER_APP_ASSETS_DIR=${pkgs.fluxer_ingress}/assets" + # "FLUXER_INGRESS_ROUTES_FILE=${pkgs.fluxer_ingress}/ingress-routes.json" "FLUXER_CSP_SCRIPT_ORIGINS=*" "FLUXER_CSP_STYLE_ORIGINS=*" "FLUXER_CSP_IMG_ORIGINS=*" @@ -302,6 +302,7 @@ in "FLUXER_CSP_FRAME_ORIGINS=*" "FLUXER_CSP_WORKER_ORIGINS=*" "FLUXER_CSP_MANIFEST_ORIGINS=*" + "RUST_BACKTRACE=1" ]; SupplementaryGroups = [ "fluxer" @@ -314,7 +315,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" - "fluxer_aggregate.service" + "fluxer_server.service" "fluxer_migrate.service" "nats.service" ]; diff --git a/overlays/default/overlay.nix b/overlays/default/overlay.nix index 978d9ef..99c1897 100644 --- a/overlays/default/overlay.nix +++ b/overlays/default/overlay.nix @@ -2,7 +2,7 @@ (final: prev: rec { calc-rs = prev.callPackage ../../packages/calc-rs { }; configarr = prev.callPackage ../../packages/configarr { }; - fluxer_desktop = (import ../../packages/fluxer_nix).desktop; + fluxer_desktop = (import ../../packages/fluxer_nix_v2).desktop; elysia = prev.callPackage ../../packages/elysia { }; safenet_authentication_client = prev.callPackage ../../packages/safenet_authentication_client { }; btrustbiss = prev.callPackage ../../packages/btrustbiss { inherit safenet_authentication_client; }; diff --git a/overlays/fluxer/default.nix b/overlays/fluxer/default.nix index 06e8c4e..e8d04fd 100644 --- a/overlays/fluxer/default.nix +++ b/overlays/fluxer/default.nix @@ -1,11 +1,11 @@ { ... }: let - path = ../../packages/fluxer_selfhost; - cranePath = ../../packages/fluxer_nix; + fluxer = (import ../../packages/fluxer_nix_v2); in (final: prev: { - fluxer_api = prev.callPackage (path + /api.nix) { }; - fluxer_app = prev.callPackage (path + /app.nix) { }; - fluxer_ingress = prev.callPackage (path + /ingress.nix) { }; - fluxer_aggregate = ((import cranePath).aggregate_services); + # fluxer_api = prev.callPackage (path + /api.nix) { }; + # fluxer_app = prev.callPackage (path + /app.nix) { }; + # fluxer_ingress = prev.callPackage (path + /ingress.nix) { }; + fluxer_server = fluxer.aggregate; + fluxer_api = fluxer.api; }) diff --git a/vms/fluxer.nix b/vms/fluxer.nix index 1f08e33..c9af599 100644 --- a/vms/fluxer.nix +++ b/vms/fluxer.nix @@ -68,7 +68,7 @@ }; environment.defaultPackages = with pkgs; [ helix - fluxer_app + fluxer_server minio-client ]; nixpkgs.overlays = [ @@ -138,7 +138,6 @@ host all all ::1/8 trust ''; }; - pgadmin = { enable = true;