From: Vsevolod Stakhov Date: Wed, 12 Jun 2013 14:59:12 +0000 (+0100) Subject: Export rspamd paths to lua. X-Git-Tag: 0.6.0~295 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be05d7af71ac14a9f515254185e16522310b5ad;p=thirdparty%2Frspamd.git Export rspamd paths to lua. --- diff --git a/config.h.in b/config.h.in index d959da5b0e..b7fae4c6dc 100644 --- a/config.h.in +++ b/config.h.in @@ -198,6 +198,10 @@ #cmakedefine GLIB_HASH_COMPAT 1 #cmakedefine PARAM_H_HAS_BITSET 1 +#define ETC_PREFIX "${ETC_PREFIX}" +#define LOCALSTATES_PREFIX "${LOCALSTATES_PREFIX}" +#define CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}" + #define RVERSION "${RSPAMD_VERSION}" #define RID "${ID}" #define RSPAMD_MASTER_SITE_URL "${RSPAMD_MASTER_SITE_URL}" @@ -441,9 +445,6 @@ typedef off_t goffset; #include #endif -#define CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}" -#define ETC_PREFIX "${ETC_PREFIX}" - /* Forwarded declaration */ struct module_ctx; struct config_file; diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c index 63728a004d..b23ba10f8a 100644 --- a/src/lua/lua_cfg_file.c +++ b/src/lua/lua_cfg_file.c @@ -481,6 +481,14 @@ lua_check_condition (struct config_file *cfg, const gchar *condition) lua_pushstring (L, ""); lua_setglobal (L, "osrelease"); #endif + + /* Rspamd paths */ + lua_newtable (L); + lua_set_table_index (L, "etcdir", ETC_PREFIX); + lua_set_table_index (L, "prefix", CMAKE_PREFIX); + lua_set_table_index (L, "localstatesdir", LOCALSTATES_PREFIX); + lua_setglobal (L, "rspamd_paths"); + /* Make fake string */ hostlen = sizeof (FAKE_RES_VAR "=") + strlen (condition); condbuf = g_malloc (hostlen);