diff options
author | Vitezslav Kriz <vitezslav.kriz@nic.cz> | 2017-08-14 09:25:42 +0200 |
---|---|---|
committer | Petr Špaček <petr.spacek@nic.cz> | 2018-01-23 15:54:34 +0100 |
commit | 6c2db2b56b5cca96513e2da872d8336743172464 (patch) | |
tree | d6b5abe482922ded0aadb6f3d55d402eba085e23 /daemon/engine.h | |
parent | Merge branch 'draft-huston-kskroll-sentinel' into 'master' (diff) | |
download | knot-resolver-6c2db2b56b5cca96513e2da872d8336743172464.tar.xz knot-resolver-6c2db2b56b5cca96513e2da872d8336743172464.zip |
keyfile argument distiguish managed and unmanaged mode
Arguments --keyfile, -k for managed mode
and
--keyfile-ro, -K for unmanaged (readonly) mode.
Automatic setting based on the file permission is removed because it was
confusing and could easily lead to state where automatic update does not
happen because of unexpected file permissions.
Check if folder is writeable was moved into Lua code.
Default unmanaged keyfile path can be specified at compile
time with option KEYFILE_DEFAULT. This default
configuration can be disabled in configuration file with
trust_anchors.keyfile_default = nil.
Diffstat (limited to 'daemon/engine.h')
-rw-r--r-- | daemon/engine.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/daemon/engine.h b/daemon/engine.h index 25ee30a1..dea87c11 100644 --- a/daemon/engine.h +++ b/daemon/engine.h @@ -83,12 +83,13 @@ int engine_pcall(struct lua_State *L, int argc); int engine_ipc(struct engine *engine, const char *expr); -/** Start the lua engine and execute the config. - * - * @note Special path "-" means that even default config won't be done - * (like listening on localhost). - */ -int engine_start(struct engine *engine, const char *config_path); + +int engine_load_sandbox(struct engine *engine); +int engine_loadconf(struct engine *engine, const char *config_path); +int engine_load_defaults(struct engine *engine); + +/** Start the lua engine and execute the config. */ +int engine_start(struct engine *engine); void engine_stop(struct engine *engine); int engine_register(struct engine *engine, const char *name, const char *precedence, const char* ref); int engine_unregister(struct engine *engine, const char *name); |