From ebb1283d593e33e9fdecf3edc017478c0d4632fe Mon Sep 17 00:00:00 2001 From: dawn <90008@gaze.systems> Date: Sun, 11 Jan 2026 06:44:26 +0000 Subject: [PATCH] add zipline --- _sources/generated.json | 16 ++++++++-------- _sources/generated.nix | 16 ++++++++-------- dns/dnsconfig.js | 2 +- secrets/secrets.nix | 1 + secrets/ziplineCfg.age | 17 +++++++++++++++++ hosts/trimounts/modules/zipline.nix | 38 ++++++++++++++++++++++++++++++++++++++ 6 file(s) changed, 73 insertion(s)(+), 17 deletion(s)(-) diff --git a/_sources/generated.json b/_sources/generated.json --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "blog": { "cargoLocks": null, - "date": "2025-12-26", + "date": "2026-01-02", "extract": null, "name": "blog", "passthru": null, @@ -32,13 +32,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "95c18d69c811a6483df1a2c6b727f696db39858e", - "sha256": "sha256-VeX7C0PQdhQu14xxeCftFUFWO7MhssvulC319s82Jt4=", + "rev": "ebcd9b9d5234d7b68cc280b1ed5fadf46148ac28", + "sha256": "sha256-zI8oVPkBnUHw5ce15gM3hYLUpzOphaLIsp0Agb+Yg8g=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "95c18d69c811a6483df1a2c6b727f696db39858e" + "version": "ebcd9b9d5234d7b68cc280b1ed5fadf46148ac28" }, "clickee": { "cargoLocks": null, @@ -309,7 +309,7 @@ }, "nucleus": { "cargoLocks": null, - "date": "2025-12-29", + "date": "2026-01-08", "extract": null, "name": "nucleus", "passthru": null, @@ -319,13 +319,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "a006a151d45bd8a6947e4c1f01fcf4e91b238148", - "sha256": "sha256-O06LWhgRAXROVZY5OnavN7R44Mh5et8safKJ9TyaAFI=", + "rev": "8e9b9b08068d2732ca01a8b45d75a4db6d445ec6", + "sha256": "sha256-PowSI4NiBj/zwkStSzhYJ1P2Yx6xFDGUArwRWQ3zujA=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/nucleus" }, - "version": "a006a151d45bd8a6947e4c1f01fcf4e91b238148" + "version": "8e9b9b08068d2732ca01a8b45d75a4db6d445ec6" }, "stylix": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,17 +15,17 @@ }; blog = { pname = "blog"; - version = "95c18d69c811a6483df1a2c6b727f696db39858e"; + version = "ebcd9b9d5234d7b68cc280b1ed5fadf46148ac28"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "95c18d69c811a6483df1a2c6b727f696db39858e"; + rev = "ebcd9b9d5234d7b68cc280b1ed5fadf46148ac28"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-VeX7C0PQdhQu14xxeCftFUFWO7MhssvulC319s82Jt4="; + sha256 = "sha256-zI8oVPkBnUHw5ce15gM3hYLUpzOphaLIsp0Agb+Yg8g="; }; - date = "2025-12-26"; + date = "2026-01-02"; }; clickee = { pname = "clickee"; @@ -197,17 +197,17 @@ }; nucleus = { pname = "nucleus"; - version = "a006a151d45bd8a6947e4c1f01fcf4e91b238148"; + version = "8e9b9b08068d2732ca01a8b45d75a4db6d445ec6"; src = fetchgit { url = "https://tangled.org/@ptr.pet/nucleus"; - rev = "a006a151d45bd8a6947e4c1f01fcf4e91b238148"; + rev = "8e9b9b08068d2732ca01a8b45d75a4db6d445ec6"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-O06LWhgRAXROVZY5OnavN7R44Mh5et8safKJ9TyaAFI="; + sha256 = "sha256-PowSI4NiBj/zwkStSzhYJ1P2Yx6xFDGUArwRWQ3zujA="; }; - date = "2025-12-29"; + date = "2026-01-08"; }; stylix = { pname = "stylix"; diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -123,7 +123,7 @@ "ptr.pet", REG_NONE, DnsProvider(DSP_PRIMARY), - TRIMOUNTS(["@", "tunes"], CF_PROXY_OFF), + TRIMOUNTS(["@", "tunes", "x"], CF_PROXY_OFF), DZWONEK(["nucleus", "trill", "dysnomia"], CF_PROXY_OFF), // atproto TXT("_atproto", "did=did:plc:dfl62fgb7wtjj3fcbb72naae"), diff --git a/secrets/secrets.nix b/secrets/secrets.nix --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -36,4 +36,5 @@ trimounts ]; "atfileCfg.age".publicKeys = [yusdacra]; + "ziplineCfg.age".publicKeys = [yusdacra trimounts]; } diff --git a/secrets/ziplineCfg.age b/secrets/ziplineCfg.age new file mode 100644 --- /dev/null +++ b/secrets/ziplineCfg.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-rsa Abmvag +lRC+SPK4XCbr5inOJktQWIc2wx3+maCS4vum4cW+0p8Q536ltUYsVSX+xdcJ1zIn +EFzcdsYV+aS7xiuBSAi82RVGbemRTfdmnLZadByDi77HwD6TZVeWV6JyPrXjcSqG +4REEBxx3IraMwslT6nYJcNXlvpf19hAchBtvF1JnALv7Vim3dPQgFvOqJL+cMPVX +9QBWusLl7H0spAn1v46shyFTLoQcR/ijblf4LSjob0fCHOjc+mhEZOBY7aJFwYZ9 +U51rxXATCx+guZ9bYoY92eqoBca6utOehWp2Esk5bd7LkOJf7MVt4rtN5Eno8unP +PBEyn2hl5CeayYdxFqvxttv78w4HsWwVZQPHQ2YuoEdhY/dBCRLcvTG6Q6BfTCRf +aBcCQSnDmiWL3DJE+J3oR4LpyEISqQ/a3rm1bS/HF3bP2VuJ74pkuh+72ThE9eeE +3SDla1VqjezA0vICoVR8Zxwg/GXFy3D7HLlKv4j+/PpKAKF1zNFHwyncOilMySpy +2EeClYZslHUTOwVka7otiR5tBMZSAyqjylPtjTm/wZSev1Uu2K2p5mYoF7ZFcBpz +4teDxq0Q3IFInSDvNWRc95xlK5GIWAnvyLjvZKVdBhgeMUgxzf14gWrA2SlrQKRw +jpWLaqsCAoz6Lqtlk94b6ROoHFTnAgUBv3E8X7fcgJM +-> ssh-ed25519 LaQclg zuIZAeqEfmgbqoqoTiOuduDmkdC9xe1ylI5PzKYoJVA +MIZup5fCnhZUxH9Fn7MUamSeTYGJ7AJH3C+jA0hiYPM +--- bsteklAEts03TMyIXRGQ/CIheCwP483GG92TLyDi/jU +�YJ�w���������񌤑$���k/�ݕ�J�c���H>��:�� �H��^��޴�O��A-w�Z��F�ҷq5���Pk{@����=3 \ No newline at end of file diff --git a/hosts/trimounts/modules/zipline.nix b/hosts/trimounts/modules/zipline.nix new file mode 100644 --- /dev/null +++ b/hosts/trimounts/modules/zipline.nix @@ -0,0 +1,38 @@ +{config, ...}: +let + rootDomain = "ptr.pet"; + domain = "x.${rootDomain}"; +in +{ + age.secrets.ziplineCfg = { + file = ../../../secrets/ziplineCfg.age; + }; + + services.zipline = { + enable = true; + settings = { + CORE_HOSTNAME = "127.0.0.1"; + CORE_PORT = 4488; + }; + environmentFiles = [config.age.secrets.ziplineCfg.path]; + database.createLocally = true; + }; + + security.acme.certs.${rootDomain}.extraDomainNames = [domain]; + services.nginx.virtualHosts.${domain} = let + localAddr = with config.services.zipline.settings; "http://${CORE_HOSTNAME}:${toString CORE_PORT}"; + in { + useACMEHost = rootDomain; + forceSSL = true; + quic = true; + kTLS = true; + + locations."/" = { + proxyPass = localAddr; + extraConfig = '' + client_max_body_size 50M; + proxy_request_buffering off; + ''; + }; + }; +} \ No newline at end of file -- tangled.sh