Bump bluesky-pds to v0.4.219 and fix tangled service options
The deployed PDS was on v0.4.182 with a 50 MB blob upload limit, causing
upload failures for large images. Add an overlay that overrides bluesky-pds
to v0.4.219 (the latest tag in the bluesky-social/pds repo, ahead of
nixpkgs-unstable's 0.4.204) and set PDS_BLOB_UPLOAD_LIMIT explicitly to
100 MB.
Also fix `services.tangled-{knot,spindle}` -> `services.tangled.{knot,spindle}`
to match the option names exposed by the official tangled.org/@tangled.org/core
flake we import. The hyphenated names came from an older third-party flake
and have been causing every auto-update to fail since the tangled rev bumped
on Apr 20.
This commit is contained in:
+15
-24
@@ -12,15 +12,24 @@
|
||||
settings = {
|
||||
PDS_PORT = 5556;
|
||||
PDS_HOSTNAME = "pds.commonscomputer.com";
|
||||
# 100 MB blob upload limit (matches upstream default as of v0.4.219).
|
||||
# Set explicitly so the limit is visible in our config rather than
|
||||
# depending on whatever default the pinned nixpkgs module ships with.
|
||||
PDS_BLOB_UPLOAD_LIMIT = "104857600";
|
||||
# We can set a bunch of other things too
|
||||
# PDS_BSKY_APP_VIEW_URL
|
||||
# PDS_CRAWLERS
|
||||
# PDS_BLOB_UPLOAD_LIMIT
|
||||
# Full list available here: https://github.com/bluesky-social/atproto/blob/main/packages/pds/src/config/env.ts
|
||||
};
|
||||
};
|
||||
|
||||
services.tangled-spindle = {
|
||||
# Note: the option namespace is `services.tangled.<service>` (with a dot),
|
||||
# not `services.tangled-<service>` (with a dash). The dashed form was used
|
||||
# by an older third-party `tangled-knot-nix` flake; the official monorepo
|
||||
# at tangled.org/@tangled.org/core (which we import) uses the dotted form.
|
||||
# See nix/modules/{knot,spindle}.nix in the tangled core flake for the
|
||||
# full list of options.
|
||||
services.tangled.spindle = {
|
||||
enable = true;
|
||||
server = {
|
||||
hostname = "spindle.commonscomputer.com";
|
||||
@@ -28,30 +37,12 @@
|
||||
};
|
||||
};
|
||||
|
||||
# stolen from https://tangled.org/@isuggest.selfce.st/tangled-knot-nix/blob/main/knot.nix
|
||||
services.tangled-knot = {
|
||||
services.tangled.knot = {
|
||||
enable = true;
|
||||
server = {
|
||||
hostname = "knot.commonscomputer.com"; # put in the hostname where your knot can be accessed at. e.g. knot.a.tgirl.gay
|
||||
owner = "did:plc:om5yygegi4yxcbay5gemn2wm"; # your did, must be did:plc:<whatever> or did:web:<whatever>.
|
||||
hostname = "knot.commonscomputer.com";
|
||||
owner = "did:plc:om5yygegi4yxcbay5gemn2wm";
|
||||
};
|
||||
# optional configuration options. the current value is the default provided to the knot server.
|
||||
# appviewEndpoint = "https://tangled.sh"; # appview endpoint.
|
||||
# gitUser = "git"; # user that hosts git repos and performs git operations.
|
||||
# openFirewall = true; # open port 22 in the firewall for ssh.
|
||||
# stateDir = "/home/${cfg.gitUser}"; # tangled knot data directory.
|
||||
# repo = {
|
||||
# scanPath = cfg.stateDir; # path where repositories are scanned from;
|
||||
# mainBranch = "main"; # default branch name for repositories;
|
||||
# };
|
||||
# motd = ""; # message of the day. the contents are shown as-is; eg. you will want to add a newline if setting a non-empty message since the knot won't do this for you.
|
||||
# motdFile = null; # "file containing message of the day. the contents are shown as-is; eg. you will want to add a newline if setting a non-empty message since the knot won't do this for you."
|
||||
# server = {
|
||||
# listenAddr = "0.0.0.0:5555"; # address to listen on.
|
||||
# internalListenAddr = "127.0.0.1:5444"; # internal address for inter-service communication.
|
||||
# dbPath = "${cfg.stateDir}/knotserver.db"; # path to the database file.
|
||||
# dev = false; # enable development mode (disables signature verification)
|
||||
# };
|
||||
};
|
||||
|
||||
services.caddy = {
|
||||
@@ -59,7 +50,7 @@
|
||||
virtualHosts = {
|
||||
"knot.commonscomputer.com".extraConfig = ''
|
||||
reverse_proxy http://localhost:5555
|
||||
'';
|
||||
'';
|
||||
"pds.commonscomputer.com".extraConfig = ''
|
||||
reverse_proxy http://localhost:5556
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user