aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-11-26 20:05:19 +0100
committerbptato <nincsnevem662@gmail.com>2024-11-26 20:05:19 +0100
commit8adbe5443a35c6e00cf7b2c4929c8fbcd72be91e (patch)
treee06d582e3c4ee80274c7eb92f2dff96b2b9383bc /src
parentd2f627f0ac1642b53794134c1249c39743101e5b (diff)
downloadchawan-8adbe5443a35c6e00cf7b2c4929c8fbcd72be91e.tar.gz
config.configdir -> config.dir
Diffstat (limited to 'src')
-rw-r--r--src/config/config.nim2
-rw-r--r--src/main.nim6
-rw-r--r--src/server/forkserver.nim2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/config/config.nim b/src/config/config.nim
index 0edd144d..f61e6b4f 100644
--- a/src/config/config.nim
+++ b/src/config/config.nim
@@ -162,7 +162,7 @@ type
Config* = ref object
jsctx*: JSContext
jsvfns*: seq[JSValueFunction]
- configdir* {.jsget.}: string
+ dir* {.jsget.}: string
`include` {.jsget.}: seq[ChaPathResolved]
start* {.jsget.}: StartConfig
buffer* {.jsget.}: BufferSectionConfig
diff --git a/src/main.nim b/src/main.nim
index c183c01f..ccf28703 100644
--- a/src/main.nim
+++ b/src/main.nim
@@ -206,17 +206,17 @@ const defaultConfig = staticRead"res/config.toml"
proc initConfig(ctx: ParamParseContext; config: Config;
warnings: var seq[string]): Err[string] =
- let fs = openConfig(config.configdir, ctx.configPath)
+ let fs = openConfig(config.dir, ctx.configPath)
if fs == nil and ctx.configPath.isSome:
# The user specified a non-existent config file.
return err("Failed to open config file " & ctx.configPath.get)
- putEnv("CHA_CONFIG_DIR", config.configdir)
+ putEnv("CHA_CONFIG_DIR", config.dir)
?config.parseConfig("res", defaultConfig, warnings)
when defined(debug):
if (let fs = newFileStream(getCurrentDir() / "res/config.toml"); fs != nil):
?config.parseConfig(getCurrentDir(), fs.readAll(), warnings)
if fs != nil:
- ?config.parseConfig(config.configdir, fs.readAll(), warnings)
+ ?config.parseConfig(config.dir, fs.readAll(), warnings)
for opt in ctx.opts:
?config.parseConfig(getCurrentDir(), opt, warnings, laxnames = true)
config.css.stylesheet &= ctx.stylesheet
diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim
index 4d95f815..3a3fe9ab 100644
--- a/src/server/forkserver.nim
+++ b/src/server/forkserver.nim
@@ -45,7 +45,7 @@ proc loadConfig*(forkserver: ForkServer; config: Config): int =
cgiDir: seq[string](config.external.cgi_dir),
tmpdir: config.external.tmpdir,
sockdir: config.external.sockdir,
- configdir: config.configdir
+ configdir: config.dir
))
var r = forkserver.istream.initPacketReader()
var process: int