更新kni版本,增加subscribe ip扫描

2019-09-24 18:30:21 +08:00
parent 7f9c5438f0
commit 6b6320ec7d
5 changed files with 20 additions and 7 deletions
--- a/roles/kni/files/kni-2.1.0.b0bbde4-1.el7.centos.x86_64.rpm
+++ b/roles/kni/files/kni-2.1.0.b0bbde4-1.el7.centos.x86_64.rpm
--- a/roles/kni/files/kni-2.1.1.e65880a-1.el7.centos.x86_64.rpm
+++ b/roles/kni/files/kni-2.1.1.e65880a-1.el7.centos.x86_64.rpm
--- a/roles/kni/templates/kni.conf.j2
+++ b/roles/kni/templates/kni.conf.j2
@@ -35,16 +35,21 @@ keepalive_idle = 2
 keepalive_intvl = 1
 keepalive_cnt = 3

-[maat]
+[static_maat]
 readconf_mode = {{ kni.maat.readconf_mode }}
-tableinfo_path = ./conf/kni/maat_tableinfo.conf
+tableinfo_path = ./conf/kni/static_maat_tableinfo.conf
 maatjson_path = ./conf/kni/maat_test.json
 redis_ip = {{ maat_redis_server.address }}
 redis_port = {{ maat_redis_server.port }}
 redis_index = {{ maat_redis_server.db }}
-tablename_intercept_ip = PXY_INTERCEPT_IP
-tablename_intercept_domain = PXY_INTERCEPT_DOMAIN
-default_action = {{ kni.maat.default_action }}
+
+[dynamic_maat]
+readconf_mode = {{ kni.maat.readconf_mode }}
+tableinfo_path = ./conf/kni/dynamic_maat_tableinfo.conf
+maatjson_path = ./conf/kni/maat_test.json
+redis_ip = {{ dynamic_maat_redis_server.address }}
+redis_port = {{ dynamic_maat_redis_server.port }}
+redis_index = {{ dynamic_maat_redis_server.db }}

 [send_logger]
 switch = {{ kni.send_logger.switch }}