tangled.org / core
Monorepo for Tangled tangled.org
fork atom

nix,spindle: use DATA_DIR for db & other spindle data #983

open opened by boltless.me targeting master from sl/spindle-rewrite

This single persistent directory can be used for storing general spindle data like db, motd file and upcoming sparse-clone git repos.

db path will be ${DATA_DIR}/spindle.db

Signed-off-by: Seongmin Lee git@boltless.me

STACK 15
#987 appview: listen for pipeline events from spindlestream
0
#4
#986 knotserver,spindle: remove all pipeline logics from knotserver
0
#4
#985 spindle: create pipeline events from spindle
0
#4
#984 nix,spindle: sync workflow files on sh.tangled.git.refUpdate
0
#4
#983 nix,spindle: use DATA_DIR for db & other spindle data
0
#4
#1104 nix,spindle: embed tap service
0
#0
#982 nix,spindle: switch to tap from jetstream
0
#4
#979 nix: add tap service for spindle
0
#4
#978 tap: add tap client package
0
#4
#981 spindle: recreate repos table
0
#4
#980 orm: ensure migrations table exist
0
#4
#977 spindle: switch to rbac2
0
#4
#976 rbac2: rbac enforcer rewrite
0
#4
#975 nix: add more nix packages/modules related to atproto
0
#4
#1103 go.mod: bump indigo version
0
#0
Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mckguakf7d22
+8 -8
Interdiff #3 → #4
unified split
+8 -8
nix/modules/spindle.nix
··· 25 description = "Address to listen on"; 26 }; 27 28 - dbPath = mkOption { 29 type = types.path; 30 - default = "/var/lib/spindle/spindle.db"; 31 - description = "Path to the database file"; 32 }; 33 34 hostname = mkOption { 35 description = "Address to listen on"; 36 }; 37 38 - stateDir = mkOption { 39 type = types.path; 40 - default = "/var/lib/spindle"; 41 - description = "Tangled spindle data directory"; 42 }; 43 44 hostname = mkOption { ··· 137 StateDirectory = "spindle"; 138 Environment = [ 139 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 140 - "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}" 141 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 142 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 143 "SPINDLE_SERVER_RELAY_URL=${cfg.server.relayUrl}" ··· 150 StateDirectory = "spindle"; 151 Environment = [ 152 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 153 - "SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}" 154 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 155 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 156 "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"
··· 25 description = "Address to listen on"; 26 }; 27 28 + stateDir = mkOption { 29 type = types.path; 30 + default = "/var/lib/spindle"; 31 + description = "Tangled spindle data directory"; 32 }; 33 34 hostname = mkOption { 35 description = "Address to listen on"; 36 }; 37 38 + dbPath = mkOption { 39 type = types.path; 40 + default = "/var/lib/spindle/spindle.db"; 41 + description = "Path to the database file"; 42 }; 43 44 hostname = mkOption { ··· 137 StateDirectory = "spindle"; 138 Environment = [ 139 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 140 + "SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}" 141 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 142 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 143 "SPINDLE_SERVER_RELAY_URL=${cfg.server.relayUrl}" ··· 150 StateDirectory = "spindle"; 151 Environment = [ 152 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 153 + "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}" 154 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 155 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 156 "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"
nix/vm.nix

This file has not been changed.

spindle/config/config.go

This patch was likely rebased, as context lines do not match.

History

5 rounds 0 comments
sign up or login to add to the discussion
boltless.me submitted #4
diff
1 commit
expand
29e4b218
nix,spindle: use DATA_DIR for db & other spindle data
merge conflicts detected
expand
  • appview/state/state.go:35
expand 0 comments
boltless.me submitted #3
diff interdiff
1 commit
expand
da25694e
nix,spindle: use DATA_DIR for db & other spindle data
expand 0 comments
boltless.me submitted #2
diff interdiff
1 commit
expand
38bf162d
nix,spindle: use DATA_DIR for db & other spindle data
expand 0 comments
boltless.me submitted #1
diff interdiff
1 commit
expand
fbcf8a33
nix,spindle: use DATA_DIR for db & other spindle data
expand 0 comments
boltless.me submitted #0
diff
1 commit
expand
e3a4378c
nix,spindle: use DATA_DIR for db & other spindle data
expand 0 comments