tangled.org
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
+8
-8
nix/modules/spindle.nix
+8
-8
nix/modules/spindle.nix
···
25
25
description = "Address to listen on";
26
26
};
27
27
28
-
dbPath = mkOption {
28
+
stateDir = mkOption {
29
29
type = types.path;
30
-
default = "/var/lib/spindle/spindle.db";
31
-
description = "Path to the database file";
30
+
default = "/var/lib/spindle";
31
+
description = "Tangled spindle data directory";
32
32
};
33
33
34
34
hostname = mkOption {
35
35
description = "Address to listen on";
36
36
};
37
37
38
-
stateDir = mkOption {
38
+
dbPath = mkOption {
39
39
type = types.path;
40
-
default = "/var/lib/spindle";
41
-
description = "Tangled spindle data directory";
40
+
default = "/var/lib/spindle/spindle.db";
41
+
description = "Path to the database file";
42
42
};
43
43
44
44
hostname = mkOption {
···
137
137
StateDirectory = "spindle";
138
138
Environment = [
139
139
"SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"
140
-
"SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}"
140
+
"SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}"
141
141
"SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}"
142
142
"SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}"
143
143
"SPINDLE_SERVER_RELAY_URL=${cfg.server.relayUrl}"
···
150
150
StateDirectory = "spindle";
151
151
Environment = [
152
152
"SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"
153
-
"SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}"
153
+
"SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}"
154
154
"SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}"
155
155
"SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}"
156
156
"SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"
nix/vm.nix
nix/vm.nix
This file has not been changed.
spindle/config/config.go
spindle/config/config.go
This patch was likely rebased, as context lines do not match.
History
5 rounds
0 comments
boltless.me
submitted
#4
1 commit
expand
collapse
nix,spindle: use
DATA_DIR for db & other spindle data
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>
2/3 failed, 1/3 success
expand
collapse
merge conflicts detected
expand
collapse
expand
collapse
- appview/state/state.go:35
- go.mod:9
- go.sum:483
- nix/gomod2nix.toml:510
expand 0 comments
boltless.me
submitted
#3
1 commit
expand
collapse
nix,spindle: use
DATA_DIR for db & other spindle data
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>
2/3 failed, 1/3 success
expand
collapse
expand 0 comments
boltless.me
submitted
#2
1 commit
expand
collapse
nix,spindle: use
DATA_DIR for db & other spindle data
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>
2/3 failed, 1/3 success
expand
collapse
expand 0 comments
boltless.me
submitted
#1
1 commit
expand
collapse
nix,spindle: use
DATA_DIR for db & other spindle data
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>
2/3 failed, 1/3 success
expand
collapse
expand 0 comments
boltless.me
submitted
#0
1 commit
expand
collapse
nix,spindle: use
DATA_DIR for db & other spindle data
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>