nix/modules: add complete appview config paramaters #778

Secrets alone can be loaded from the environmentFile.

Signed-off-by: Anirudh Oppiliappan anirudh@tangled.org

+37 -31

1 changed file

Interdiff #0 → #1

expand all

nix

modules

appview.nix

+37 -31

nix/modules/appview.nix

··· 279 279 ReadWritePaths = ["/var/lib/appview"]; 280 280 }; 281 281 282 - environment = { 283 - TANGLED_DB_PATH = cfg.dbPath; 284 - TANGLED_LISTEN_ADDR = cfg.listenAddr; 285 - TANGLED_APPVIEW_HOST = cfg.appviewHost; 286 - TANGLED_APPVIEW_NAME = cfg.appviewName; 287 - TANGLED_DEV = if cfg.dev then "true" else "false"; 288 - } // optionalAttrs (cfg.disallowedNicknamesFile != null) { 289 - TANGLED_DISALLOWED_NICKNAMES_FILE = cfg.disallowedNicknamesFile; 290 - } // { 291 - TANGLED_REDIS_ADDR = cfg.redis.addr; 292 - TANGLED_REDIS_DB = toString cfg.redis.db; 282 + environment = 283 + { 284 + TANGLED_DB_PATH = cfg.dbPath; 285 + TANGLED_LISTEN_ADDR = cfg.listenAddr; 286 + TANGLED_APPVIEW_HOST = cfg.appviewHost; 287 + TANGLED_APPVIEW_NAME = cfg.appviewName; 288 + TANGLED_DEV = 289 + if cfg.dev 290 + then "true" 291 + else "false"; 292 + } 293 + // optionalAttrs (cfg.disallowedNicknamesFile != null) { 294 + TANGLED_DISALLOWED_NICKNAMES_FILE = cfg.disallowedNicknamesFile; 295 + } 296 + // { 297 + TANGLED_REDIS_ADDR = cfg.redis.addr; 298 + TANGLED_REDIS_DB = toString cfg.redis.db; 293 299 294 - TANGLED_JETSTREAM_ENDPOINT = cfg.jetstream.endpoint; 300 + TANGLED_JETSTREAM_ENDPOINT = cfg.jetstream.endpoint; 295 301 296 - TANGLED_KNOTSTREAM_RETRY_INTERVAL = cfg.knotstream.retryInterval; 297 - TANGLED_KNOTSTREAM_MAX_RETRY_INTERVAL = cfg.knotstream.maxRetryInterval; 298 - TANGLED_KNOTSTREAM_CONNECTION_TIMEOUT = cfg.knotstream.connectionTimeout; 299 - TANGLED_KNOTSTREAM_WORKER_COUNT = toString cfg.knotstream.workerCount; 300 - TANGLED_KNOTSTREAM_QUEUE_SIZE = toString cfg.knotstream.queueSize; 302 + TANGLED_KNOTSTREAM_RETRY_INTERVAL = cfg.knotstream.retryInterval; 303 + TANGLED_KNOTSTREAM_MAX_RETRY_INTERVAL = cfg.knotstream.maxRetryInterval; 304 + TANGLED_KNOTSTREAM_CONNECTION_TIMEOUT = cfg.knotstream.connectionTimeout; 305 + TANGLED_KNOTSTREAM_WORKER_COUNT = toString cfg.knotstream.workerCount; 306 + TANGLED_KNOTSTREAM_QUEUE_SIZE = toString cfg.knotstream.queueSize; 301 307 302 - TANGLED_SPINDLESTREAM_RETRY_INTERVAL = cfg.spindlestream.retryInterval; 303 - TANGLED_SPINDLESTREAM_MAX_RETRY_INTERVAL = cfg.spindlestream.maxRetryInterval; 304 - TANGLED_SPINDLESTREAM_CONNECTION_TIMEOUT = cfg.spindlestream.connectionTimeout; 305 - TANGLED_SPINDLESTREAM_WORKER_COUNT = toString cfg.spindlestream.workerCount; 306 - TANGLED_SPINDLESTREAM_QUEUE_SIZE = toString cfg.spindlestream.queueSize; 308 + TANGLED_SPINDLESTREAM_RETRY_INTERVAL = cfg.spindlestream.retryInterval; 309 + TANGLED_SPINDLESTREAM_MAX_RETRY_INTERVAL = cfg.spindlestream.maxRetryInterval; 310 + TANGLED_SPINDLESTREAM_CONNECTION_TIMEOUT = cfg.spindlestream.connectionTimeout; 311 + TANGLED_SPINDLESTREAM_WORKER_COUNT = toString cfg.spindlestream.workerCount; 312 + TANGLED_SPINDLESTREAM_QUEUE_SIZE = toString cfg.spindlestream.queueSize; 307 313 308 - TANGLED_RESEND_SENT_FROM = cfg.resend.sentFrom; 314 + TANGLED_RESEND_SENT_FROM = cfg.resend.sentFrom; 309 315 310 - TANGLED_POSTHOG_ENDPOINT = cfg.posthog.endpoint; 316 + TANGLED_POSTHOG_ENDPOINT = cfg.posthog.endpoint; 311 317 312 - TANGLED_CAMO_HOST = cfg.camo.host; 318 + TANGLED_CAMO_HOST = cfg.camo.host; 313 319 314 - TANGLED_AVATAR_HOST = cfg.avatar.host; 320 + TANGLED_AVATAR_HOST = cfg.avatar.host; 315 321 316 - TANGLED_PLC_URL = cfg.plc.url; 322 + TANGLED_PLC_URL = cfg.plc.url; 317 323 318 - TANGLED_PDS_HOST = cfg.pds.host; 324 + TANGLED_PDS_HOST = cfg.pds.host; 319 325 320 - TANGLED_LABEL_DEFAULTS = concatStringsSep "," cfg.label.defaults; 321 - TANGLED_LABEL_GFI = cfg.label.goodFirstIssue; 322 - }; 326 + TANGLED_LABEL_DEFAULTS = concatStringsSep "," cfg.label.defaults; 327 + TANGLED_LABEL_GFI = cfg.label.goodFirstIssue; 328 + }; 323 329 }; 324 330 }; 325 331 }