gfwleak/solutions-tsg-scripts
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
崔一鸣
2019-09-24 18:30:21 +08:00
parent 7f9c5438f0
commit 6b6320ec7d
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
env-stage-hy/group_vars/all.yml
View File

@@ -3,6 +3,11 @@ maat_redis_server:
port: 7002 port: 7002
db: 0 db: 0
dynamic_maat_redis_server:
address: 192.168.100.3
port: 7002
db: 0
cert_store_server: cert_store_server:
address: 192.168.100.1 address: 192.168.100.1
port: 9991 port: 9991
@@ -27,7 +32,6 @@ kni:
switch: 1 switch: 1
maat: maat:
readconf_mode: 2 readconf_mode: 2
default_action: 128
send_logger: send_logger:
switch: 1 switch: 1
tfe_nodes: tfe_nodes:

6
env-stage-xxg/group_vars/all.yml
View File

@@ -2,6 +2,11 @@ maat_redis_server:
address: 192.168.40.120 address: 192.168.40.120
port: 7002 port: 7002
db: 0 db: 0
dynamic_maat_redis_server:
address: 192.168.100.3
port: 7002
db: 0
cert_store_server: cert_store_server:
address: 192.168.40.161 address: 192.168.40.161
@@ -27,7 +32,6 @@ kni:
switch: 1 switch: 1
maat: maat:
readconf_mode: 2 readconf_mode: 2
default_action: 128
send_logger: send_logger:
switch: 1 switch: 1
tfe_nodes: tfe_nodes:

BIN
roles/kni/files/kni-2.1.0.b0bbde4-1.el7.centos.x86_64.rpm
View File

Binary file not shown.

BIN
roles/kni/files/kni-2.1.1.e65880a-1.el7.centos.x86_64.rpm Normal file
View File

Binary file not shown.

15
roles/kni/templates/kni.conf.j2
View File

@@ -35,16 +35,21 @@ keepalive_idle = 2
keepalive_intvl = 1 keepalive_intvl = 1
keepalive_cnt = 3 keepalive_cnt = 3
[maat] [static_maat]
readconf_mode = {{ kni.maat.readconf_mode }} 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 maatjson_path = ./conf/kni/maat_test.json
redis_ip = {{ maat_redis_server.address }} redis_ip = {{ maat_redis_server.address }}
redis_port = {{ maat_redis_server.port }} redis_port = {{ maat_redis_server.port }}
redis_index = {{ maat_redis_server.db }} redis_index = {{ maat_redis_server.db }}
tablename_intercept_ip = PXY_INTERCEPT_IP
tablename_intercept_domain = PXY_INTERCEPT_DOMAIN [dynamic_maat]
default_action = {{ kni.maat.default_action }} 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] [send_logger]
switch = {{ kni.send_logger.switch }} switch = {{ kni.send_logger.switch }}