From 4e4ca0a6b0f37fd29836097dabd3ccb96dff29ec Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Sat, 4 Apr 2026 09:48:03 +0000 Subject: [PATCH 1/4] fix: remove EnvironmentFile from paperclip service --- home-manager/modules/paperclip/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/modules/paperclip/default.nix b/home-manager/modules/paperclip/default.nix index 610ff38c5..e8617f6d8 100644 --- a/home-manager/modules/paperclip/default.nix +++ b/home-manager/modules/paperclip/default.nix @@ -38,7 +38,6 @@ lib.mkIf host.isKyber { "HOME=${homeDir}" "PATH=${homeDir}/.local/bin:${homeDir}/.bun/bin:${homeDir}/.nix-profile/bin:${homeDir}/.local/share/pnpm:${homeDir}/.local/share/fnm/current/bin:${homeDir}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin" ]; - EnvironmentFile = "${instanceDir}/.env"; WorkingDirectory = "${homeDir}/.paperclip"; StandardOutput = "append:/tmp/paperclip/paperclip.log"; StandardError = "append:/tmp/paperclip/paperclip.log"; From 8f6bdf9379df4daddc36692482658c182f236926 Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Sat, 4 Apr 2026 10:07:20 +0000 Subject: [PATCH 2/4] fix: use authenticated mode on kyber, add required meta/logging fields --- config/paperclip/config.template.json | 10 ++++++++++ config/paperclip/default.nix | 1 + config/paperclip/hydrate.sh | 1 + 3 files changed, 12 insertions(+) diff --git a/config/paperclip/config.template.json b/config/paperclip/config.template.json index 9580f48f7..7ba61da3c 100644 --- a/config/paperclip/config.template.json +++ b/config/paperclip/config.template.json @@ -1,9 +1,19 @@ { + "$meta": { + "version": 1, + "updatedAt": "2026-04-04T00:00:00.000Z", + "source": "configure" + }, "database": { "mode": "__DATABASE_MODE__", "connectionString": "__DATABASE_CONNECTION_STRING__" }, + "logging": { + "mode": "file" + }, "server": { + "deploymentMode": "__DEPLOYMENT_MODE__", + "exposure": "private", "host": "__HOST__", "port": 3100 } diff --git a/config/paperclip/default.nix b/config/paperclip/default.nix index 7c98c2872..bda4b05d9 100644 --- a/config/paperclip/default.nix +++ b/config/paperclip/default.nix @@ -16,6 +16,7 @@ let database_mode = if host.isKyber then "postgres" else "embedded-postgres"; database_connection_string = if host.isKyber then "postgres://postgres:postgres@localhost:5432/paperclip" else ""; + deployment_mode = if host.isKyber then "authenticated" else "local_trusted"; host = if host.isKyber then "0.0.0.0" else "127.0.0.1"; is_kyber = if host.isKyber then "true" else "false"; }; diff --git a/config/paperclip/hydrate.sh b/config/paperclip/hydrate.sh index 7adc914cc..e3abf703a 100644 --- a/config/paperclip/hydrate.sh +++ b/config/paperclip/hydrate.sh @@ -10,6 +10,7 @@ mkdir -p "${INSTANCE_DIR}" @sed@ \ -e "s|__DATABASE_MODE__|@database_mode@|g" \ -e "s|__DATABASE_CONNECTION_STRING__|@database_connection_string@|g" \ + -e "s|__DEPLOYMENT_MODE__|@deployment_mode@|g" \ -e "s|__HOST__|@host@|g" \ "$TEMPLATE" >"$CONFIG" chmod 600 "$CONFIG" From ef37b84447a566cf414f451aafd3d7044fdbdeb1 Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Sat, 4 Apr 2026 10:18:16 +0000 Subject: [PATCH 3/4] fix: add allowedHostnames for paperclip.shunkakinoki.com --- config/paperclip/config.template.json | 3 ++- config/paperclip/default.nix | 1 + config/paperclip/hydrate.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/paperclip/config.template.json b/config/paperclip/config.template.json index 7ba61da3c..121e41150 100644 --- a/config/paperclip/config.template.json +++ b/config/paperclip/config.template.json @@ -15,6 +15,7 @@ "deploymentMode": "__DEPLOYMENT_MODE__", "exposure": "private", "host": "__HOST__", - "port": 3100 + "port": 3100, + "allowedHostnames": ["__ALLOWED_HOSTNAME__"] } } diff --git a/config/paperclip/default.nix b/config/paperclip/default.nix index bda4b05d9..5d3d84d94 100644 --- a/config/paperclip/default.nix +++ b/config/paperclip/default.nix @@ -18,6 +18,7 @@ let if host.isKyber then "postgres://postgres:postgres@localhost:5432/paperclip" else ""; deployment_mode = if host.isKyber then "authenticated" else "local_trusted"; host = if host.isKyber then "0.0.0.0" else "127.0.0.1"; + allowed_hostname = if host.isKyber then "paperclip.shunkakinoki.com" else ""; is_kyber = if host.isKyber then "true" else "false"; }; in diff --git a/config/paperclip/hydrate.sh b/config/paperclip/hydrate.sh index e3abf703a..3e95064b4 100644 --- a/config/paperclip/hydrate.sh +++ b/config/paperclip/hydrate.sh @@ -12,6 +12,7 @@ mkdir -p "${INSTANCE_DIR}" -e "s|__DATABASE_CONNECTION_STRING__|@database_connection_string@|g" \ -e "s|__DEPLOYMENT_MODE__|@deployment_mode@|g" \ -e "s|__HOST__|@host@|g" \ + -e "s|__ALLOWED_HOSTNAME__|@allowed_hostname@|g" \ "$TEMPLATE" >"$CONFIG" chmod 600 "$CONFIG" From 0ef7968a49538b1a02b82ed4a9dd12caaf1a8fda Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Sat, 4 Apr 2026 10:25:16 +0000 Subject: [PATCH 4/4] fix: format config template json --- config/paperclip/config.template.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/paperclip/config.template.json b/config/paperclip/config.template.json index 121e41150..38b5b7212 100644 --- a/config/paperclip/config.template.json +++ b/config/paperclip/config.template.json @@ -16,6 +16,8 @@ "exposure": "private", "host": "__HOST__", "port": 3100, - "allowedHostnames": ["__ALLOWED_HOSTNAME__"] + "allowedHostnames": [ + "__ALLOWED_HOSTNAME__" + ] } }