diff --git a/config/paperclip/config.template.json b/config/paperclip/config.template.json index 9580f48f7..38b5b7212 100644 --- a/config/paperclip/config.template.json +++ b/config/paperclip/config.template.json @@ -1,10 +1,23 @@ { + "$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 + "port": 3100, + "allowedHostnames": [ + "__ALLOWED_HOSTNAME__" + ] } } diff --git a/config/paperclip/default.nix b/config/paperclip/default.nix index 7c98c2872..5d3d84d94 100644 --- a/config/paperclip/default.nix +++ b/config/paperclip/default.nix @@ -16,7 +16,9 @@ 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"; + 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 7adc914cc..3e95064b4 100644 --- a/config/paperclip/hydrate.sh +++ b/config/paperclip/hydrate.sh @@ -10,7 +10,9 @@ 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" \ + -e "s|__ALLOWED_HOSTNAME__|@allowed_hostname@|g" \ "$TEMPLATE" >"$CONFIG" chmod 600 "$CONFIG" 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";