更新运行配置文件feature-dynamic-config

7 files changed, 33 insertions, 53 deletions

diff --git a/bin/PANGU_VALVE_CONF_rawfile/MAAT_REDIS_INFO.conf b/bin/PANGU_VALVE_CONF_rawfile/MAAT_REDIS_INFO.conf
index 751382a..f0900e4 100644
--- a/bin/PANGU_VALVE_CONF_rawfile/MAAT_REDIS_INFO.conf
+++ b/bin/PANGU_VALVE_CONF_rawfile/MAAT_REDIS_INFO.conf
@@ -1,8 +1,10 @@
 #INS_NAME	MAAT_ROOT	VERSION_FILE			REDIS_IP	RPORT	RINDEX	TABLE_NAMES_LIST
-STATIC	./conf/maat_cfg1/	./conf/version_static.txt	10.4.34.1	6379	5	APP_POLICY;APP_DOMAIN;PXY_INTERCEPT_DOMAIN;APP_STATIC_SEV_IP;PXY_INTERCEPT_IP;INLINE_IP_CB;WHITE_LIST_IP
-STATIC_TMP	./conf/maat_cfg1/	./conf/version_static.txt	10.4.34.1	6379	4	PXY_OBJ_SPOOFING_IP_POOL
+#STATIC	./conf/maat_cfg1/	./conf/version_static.txt	10.4.34.1	6379	5	APP_POLICY;APP_DOMAIN;PXY_INTERCEPT_DOMAIN;APP_STATIC_SEV_IP;PXY_INTERCEPT_IP;INLINE_IP_CB;WHITE_LIST_IP;PXY_OBJ_SPOOFING_IP_POOL
 #DYN_IPD	./conf/maat_cfg2/	./conf/version_dynipd.txt	10.4.20.151	6379	0	APP_DYN_SEV_IP_CB;PXY_DYN_SEV_IP_CB
-DYN_IPD	./conf/maat_cfg2/	./conf/version_dynipd.txt	10.4.20.151	6379	0	PXY_DYN_SEV_IP_CB
-DYN_YSP	./conf/maat_cfg2/	./conf/version_dynysp.txt	10.4.20.152	6379	1	MM_DYN_VOIP_DROP
+#DYN_IPD	./conf/maat_cfg2/	./conf/version_dynipd.txt	10.4.20.151	6379	0	PXY_DYN_SEV_IP_CB
+#DYN_YSP	./conf/maat_cfg2/	./conf/version_dynysp.txt	10.4.20.152	6379	1	MM_DYN_VOIP_DROP;ANTI_DDOS_ATTACK_CB
 #DYN_DK	./conf/maat_cfg2/	./conf/version_dyndk.txt	10.4.20.153	6379	10	DK_CLI_IP_CB
-DYN_DOS	./conf/maat_cfg2/	./conf/version_dyndos.txt	10.4.20.154	6379	0	ANTI_DDOS_ATTACK_CB;IR_INTERCEPT_IP
+DYNTEST1	./conf/maat_cfg2/	./conf/version_dyn1.txt	192.168.10.27	7001	2	APP_POLICY;IR_INTERCEPT_IP
+DYNTEST2	./conf/maat_cfg2/	./conf/version_dyn2.txt	192.168.10.27	7002	2	IR_INTERCEPT_IP
+DYNTEST3	./conf/maat_cfg2/	./conf/version_dyn3.txt	192.168.10.27	7003	2	IR_INTERCEPT_IP
+DYNTEST4	./conf/maat_cfg2/	./conf/version_dyn4.txt	192.168.10.27	7004	2	IR_INTERCEPT_IP
diff --git a/bin/PANGU_VALVE_CONF_rawfile/SERVICE_ID_MAP.conf b/bin/PANGU_VALVE_CONF_rawfile/SERVICE_ID_MAP.conf
index f6e8c2b..8e2e6bf 100644
--- a/bin/PANGU_VALVE_CONF_rawfile/SERVICE_ID_MAP.conf
+++ b/bin/PANGU_VALVE_CONF_rawfile/SERVICE_ID_MAP.conf
@@ -47,7 +47,7 @@
 515	100	22	1	1000
 
 #APP_POLICY REJECT 0x21
-33	0	8	1	1000
+33	0	8	0	1000
 1028	0	8	1	1000
 #APP_POLICY MONITOR 0x91
 145	0	18	1	1000
diff --git a/bin/conf/maat_table_info_valid.conf b/bin/conf/maat_table_info_valid.conf
index ef6242e..2b70698 100644
--- a/bin/conf/maat_table_info_valid.conf
+++ b/bin/conf/maat_table_info_valid.conf
@@ -19,3 +19,4 @@
 10	IPD_DYN_SUBSCIBE_IP	plugin	9
 11	ANTI_DDOS_ATTACK_CB	plugin	14
 12	MM_DYN_VOIP_DROP	plugin	14
+13	WHITE_LIST_IP	plugin	14
diff --git a/bin/conf/pangu_valve.conf b/bin/conf/pangu_valve.conf
index aa133c9..4afedfb 100644
--- a/bin/conf/pangu_valve.conf
+++ b/bin/conf/pangu_valve.conf
@@ -19,20 +19,20 @@ FS_STAT_DST_PORT=8125
 FS_STAT_MODE=1
 FS_STAT_TRIG=1
 RUN_LOG_DIR=./log
-RUN_LOG_LV=10
+RUN_LOG_LV=30
 STATISTIC_INTERVAL=60
 
 [SYSTEM]
 C3_AUTH_DATA=AABBCCDDEEFF1122
-C3_CCC_LISTS=10.4.34.1:10005;10.4.34.2:10005;10.4.34.3:10005;
+C3_CCC_LISTS=10.0.6.203:10005;
 CONSUL_LEADER_KEY=PanguValve/ValveLeader01
 CONSUL_LOCK_DELAY=5
 CONSUL_REQ_TIMEOUT=4
 CONSUL_SESSION_TTL=10
-CONSUL_SWITCH=1
+CONSUL_SWITCH=0
 #C3_CCC_LISTS=10.4.34.1:10006;
 HASH_TABLE_SIZE=16777216
-LOCAL_NET_NAME=eth2
+LOCAL_NET_NAME=em2
 #1-file; 2-redis
 MAAT_CONFIG_RECV_WAY=2
 MAAT_EFFECTIVE_RANGE={"tags":[{"tag":"location","value":"Astana"}]}
diff --git a/bin/conf/table_info/service_id_map.conf b/bin/conf/table_info/service_id_map.conf
index f6e8c2b..86416b7 100644
--- a/bin/conf/table_info/service_id_map.conf
+++ b/bin/conf/table_info/service_id_map.conf
@@ -1,10 +1,8 @@
 #service_id	limit_rate	grule_serv_type	RULE_SCOPE	limit_num
-#WHITE_LIST_IP white list
-1	0	4	1	1000
 #INLINE_IP_CB DROP
 3	0	10	1	1000
 #ANTIDDOS DROP
-5	0	17	1	1000
+5	0	7	1	1000
 #INLINE_IP_CB DROP IPSEC/GRE 0x19/0x1C
 25	0	10	1	1000
 28	0	10	1	1000
@@ -17,38 +15,13 @@
 #PXY_INTERCEPT_IP MONITOR 0x200/0x202/0x205
 512	0	21	1	1000
 514	0	21	1	1000
-514	10	21	1	1000
-514	20	21	1	1000
-514	30	21	1	1000
-514	40	21	1	1000
-514	50	21	1	1000
-514	60	21	1	1000
-514	70	21	1	1000
-514	80	21	1	1000
-514	90	21	1	1000
-514	100	21	1	1000
 517	0	21	1	1000
-#PXY_INTERCEPT_IP/PXY_OBJ_SPOOFING_IP_POOL loop 0x206/0x282
-518	0	16	1	1000
-642	0	16	1	1000
-
-#PXY_INTERCEPT_DOMAIN MONITOR 0x201/0x203
+#PXY_INTERCEPT_DOMAIN MONITOR 0x201
 513	0	22	1	1000
 515	0	22	1	1000
-515	10	22	1	1000
-515	20	22	1	1000
-515	30	22	1	1000
-515	40	22	1	1000
-515	50	22	1	1000
-515	60	22	1	1000
-515	70	22	1	1000
-515	80	22	1	1000
-515	90	22	1	1000
-515	100	22	1	1000
 
 #APP_POLICY REJECT 0x21
 33	0	8	1	1000
-1028	0	8	1	1000
 #APP_POLICY MONITOR 0x91
 145	0	18	1	1000
 #IPD_DYN_SUBSCIBE_IP
@@ -62,3 +35,7 @@
 1056	20	248	1	1000
 1056	30	249	1	1000
 1056	40	250	1	1000
+
+#TEST
+11	0	8	1	10
+
diff --git a/bin/conf/table_info/table_info_one.conf b/bin/conf/table_info/table_info_one.conf
index 8b8a7c5..d5eea1a 100644
--- a/bin/conf/table_info/table_info_one.conf
+++ b/bin/conf/table_info/table_info_one.conf
@@ -1,11 +1,11 @@
 #table_one:tabid	dynamic	type
-PXY_INTERCEPT_IP:2	0	REGION_TYPE_IP
-INLINE_IP_CB:3		0	REGION_TYPE_IP
-IR_INTERCEPT_IP:4	0	REGION_TYPE_IP
-#DK_CLI_IP_CB:5		1	REGION_TYPE_IP
-IPD_DYN_SUBSCIBE_IP:6	0	REGION_TYPE_POOL
-ANTI_DDOS_ATTACK_CB:7	0	REGION_TYPE_IP
-MM_DYN_VOIP_DROP:8	0	REGION_TYPE_IP
-WHITE_LIST_IP:9		0	REGION_TYPE_IP
-PXY_OBJ_SPOOFING_IP_POOL:10	0	REGION_TYPE_POOL
+PXY_INTERCEPT_IP:2	REGION_TYPE_IP
+INLINE_IP_CB:3		REGION_TYPE_IP
+IR_INTERCEPT_IP:4	REGION_TYPE_IP
+#DK_CLI_IP_CB:5		REGION_TYPE_IP
+IPD_DYN_SUBSCIBE_IP:6	REGION_TYPE_POOL
+ANTI_DDOS_ATTACK_CB:7	REGION_TYPE_IP
+MM_DYN_VOIP_DROP:8	REGION_TYPE_IP
+WHITE_LIST_IP:9		REGION_TYPE_IP
+PXY_OBJ_SPOOFING_IP_POOL:10	REGION_TYPE_POOL
 
diff --git a/bin/conf/table_info/table_info_tree.conf b/bin/conf/table_info/table_info_tree.conf
index 0241013..14f0ebe 100644
--- a/bin/conf/table_info/table_info_tree.conf
+++ b/bin/conf/table_info/table_info_tree.conf
@@ -1,7 +1,7 @@
 #three		two			onesw			dynamic	type
-APP_POLICY:11	APP_DOMAIN:12		APP_DYN_SEV_IP_CB:13	0	REGION_TYPE_FIND
-APP_POLICY:11	NULL			APP_STATIC_SEV_IP:14	0	REGION_TYPE_IP
-NULL		PXY_INTERCEPT_DOMAIN:15	PXY_DYN_SEV_IP_CB:16	0	REGION_TYPE_FIND
-#NULL		LIMIT_DOMAIN:17		LIMIT_DYN_IP_CB:18	0	REGION_TYPE_FIND
-APP_POLICY:11	NULL			DK_CLI_IP_CB:19		1	REGION_TYPE_IP
+APP_POLICY:11	APP_DOMAIN:12		APP_DYN_SEV_IP_CB:13	REGION_TYPE_FIND
+APP_POLICY:11	NULL			APP_STATIC_SEV_IP:14	REGION_TYPE_IP
+NULL		PXY_INTERCEPT_DOMAIN:15	PXY_DYN_SEV_IP_CB:16	REGION_TYPE_FIND
+#NULL		LIMIT_DOMAIN:17		LIMIT_DYN_IP_CB:18	REGION_TYPE_FIND
+APP_POLICY:11	NULL			DK_CLI_IP_CB:19		REGION_TYPE_IP