policy: load policy module by default

RFC 6761 mandates functionality implemented by policy module, so it is
now loaded by default. Users with special needs can still unload the
module.

diff --git a/daemon/lua/sandbox.lua b/daemon/lua/sandbox.lua
index 402db091fc44a405273b54cc14b704b7eea2393b..7cdc3dc662231b8899e09b054eef10319c4589af 100644 (file)
--- a/daemon/lua/sandbox.lua
+++ b/daemon/lua/sandbox.lua
@@ -204,6 +204,7 @@ end
 
 -- Load embedded modules
 modules.load('ta_signal_query')
+modules.load('policy')
 modules.load('priming')
 modules.load('detect_time_skew')
 modules.load('detect_time_jump')

diff --git a/modules/policy/README.rst b/modules/policy/README.rst
index 9b1bf188faf2b30ae1a3ef465379cec71f76f510..499d15f15623ae948ec8bfc48edd9a5a32e0e8db 100644 (file)
--- a/modules/policy/README.rst
+++ b/modules/policy/README.rst
@@ -193,6 +193,9 @@ Most properties (actions, filters) are described above.
       policy.todnames({'example.com', 'me.cz'})
       { '\7example\3com\0', '\2me\2cz\0' }
 
+This module is enabled by default because it implements mandatory :rfc:`6761` logic. For debugging purposes you can add ``modules.unload('policy')`` to your config to unload the module.
+
+
 .. _`Aho-Corasick`: https://en.wikipedia.org/wiki/Aho%E2%80%93Corasick_string_matching_algorithm
 .. _`@jgrahamc`: https://github.com/jgrahamc/aho-corasick-lua
 .. _RPZ: https://dnsrpz.info/

diff --git a/modules/policy/policy_test.lua b/modules/policy/policy_test.lua
index 61da580fd12c85dc34186edef6c3388437f4f71f..02f607d666c3bc1d8f2d900223bedf4ab62aa649 100644 (file)
--- a/modules/policy/policy_test.lua
+++ b/modules/policy/policy_test.lua
@@ -1,5 +1,5 @@
 -- setup resolver
-modules = { 'policy' }
+-- policy module should be loaded by default, do not load it explicitly
 
 -- test for default configuration
 local function test_tls_forward()