initial retooling
This commit is contained in:
@@ -1,11 +1,16 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
personalization = import ./personalization.nix;
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
npub = config.sovran_systemsOS.nostr_npub;
|
||||
in
|
||||
|
||||
lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
|
||||
<<<<<<< HEAD
|
||||
# ── Caddy vhost is now handled centrally in caddy.nix ─────
|
||||
|
||||
# ── Generate Haven runtime config from domain files ───────
|
||||
@@ -41,11 +46,17 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
'';
|
||||
};
|
||||
|
||||
=======
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
services.haven = {
|
||||
enable = true;
|
||||
settings = {
|
||||
OWNER_NPUB = npub;
|
||||
<<<<<<< HEAD
|
||||
# RELAY_URL injected at runtime via EnvironmentFile
|
||||
=======
|
||||
RELAY_URL = personalization.haven_url;
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
|
||||
RELAY_PORT = 3355;
|
||||
RELAY_BIND_ADDRESS = "0.0.0.0";
|
||||
@@ -53,6 +64,7 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
LMDB_MAPSIZE = 3000000000;
|
||||
BLOSSOM_PATH = "blossom/";
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Relay names/descriptions injected at runtime via EnvironmentFile
|
||||
PRIVATE_RELAY_NPUB = npub;
|
||||
CHAT_RELAY_NPUB = npub;
|
||||
@@ -60,6 +72,27 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
|
||||
INBOX_PULL_INTERVAL_SECONDS = 600;
|
||||
|
||||
=======
|
||||
PRIVATE_RELAY_NAME = "${personalization.haven_url} private relay";
|
||||
PRIVATE_RELAY_NPUB = npub;
|
||||
PRIVATE_RELAY_DESCRIPTION = "The Relay From Sovran Systems";
|
||||
|
||||
CHAT_RELAY_NAME = "${personalization.haven_url} chat relay";
|
||||
CHAT_RELAY_NPUB = npub;
|
||||
CHAT_RELAY_DESCRIPTION = "a relay for private chats";
|
||||
|
||||
OUTBOX_RELAY_NAME = "${personalization.haven_url} outbox relay";
|
||||
OUTBOX_RELAY_NPUB = npub;
|
||||
OUTBOX_RELAY_DESCRIPTION = "a relay and Blossom server for public messages and media";
|
||||
|
||||
INBOX_RELAY_NAME = "${personalization.haven_url} inbox relay";
|
||||
INBOX_RELAY_NPUB = npub;
|
||||
INBOX_RELAY_DESCRIPTION = "send your interactions with my notes here";
|
||||
|
||||
INBOX_PULL_INTERVAL_SECONDS = 600;
|
||||
|
||||
# ... all your rate limiter and WOT settings unchanged ...
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
PRIVATE_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL = 50;
|
||||
PRIVATE_RELAY_EVENT_IP_LIMITER_INTERVAL = 1;
|
||||
PRIVATE_RELAY_EVENT_IP_LIMITER_MAX_TOKENS = 100;
|
||||
@@ -124,10 +157,13 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
];
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
systemd.services.haven.serviceConfig.EnvironmentFile = [
|
||||
"/run/haven/runtime.env"
|
||||
];
|
||||
|
||||
=======
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/haven 0750 haven haven -"
|
||||
];
|
||||
@@ -153,6 +189,30 @@ lib.mkIf (config.sovran_systemsOS.features.haven && npub != "") {
|
||||
'';
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
systemd.services.haven.after = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
|
||||
systemd.services.haven.wants = [ "haven-whitelist-setup.service" "haven-runtime-config.service" ];
|
||||
=======
|
||||
systemd.services.haven.after = [ "haven-whitelist-setup.service" ];
|
||||
systemd.services.haven.wants = [ "haven-whitelist-setup.service" ];
|
||||
|
||||
services.caddy.virtualHosts = {
|
||||
"${personalization.haven_url}" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy localhost:3355 {
|
||||
header_up Host {host}
|
||||
header_up X-Real-IP {remote_host}
|
||||
header_up X-Forwarded-For {remote_host}
|
||||
header_up X-Forwarded-Proto {scheme}
|
||||
transport http {
|
||||
versions 1.1
|
||||
}
|
||||
}
|
||||
request_body {
|
||||
max_size 100MB
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user