diff options
| -rw-r--r-- | roles/firewall/files/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm | bin | 15404 -> 0 bytes | |||
| -rw-r--r-- | roles/firewall/files/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm | bin | 0 -> 15576 bytes | |||
| -rw-r--r-- | roles/firewall/files/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm | bin | 30288 -> 0 bytes | |||
| -rw-r--r-- | roles/firewall/files/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm | bin | 0 -> 26836 bytes | |||
| -rw-r--r-- | roles/firewall/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/firewall/templates/main.conf.j2 | 1 | ||||
| -rw-r--r-- | roles/sapp/templates/conflist.inf.j2 | 14 |
7 files changed, 4 insertions, 15 deletions
diff --git a/roles/firewall/files/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm Binary files differdeleted file mode 100644 index 2473cc4..0000000 --- a/roles/firewall/files/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm +++ /dev/null diff --git a/roles/firewall/files/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm Binary files differnew file mode 100644 index 0000000..ef3a69c --- /dev/null +++ b/roles/firewall/files/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm diff --git a/roles/firewall/files/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm b/roles/firewall/files/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm Binary files differdeleted file mode 100644 index 7d92f28..0000000 --- a/roles/firewall/files/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm +++ /dev/null diff --git a/roles/firewall/files/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm b/roles/firewall/files/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm Binary files differnew file mode 100644 index 0000000..b73ae01 --- /dev/null +++ b/roles/firewall/files/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 0303b67..e02b080 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -20,11 +20,11 @@ - /tmp/ansible_deploy/fw_http_plug-3.2.3.6b8c95d-2.el7.x86_64.rpm - /tmp/ansible_deploy/fw_mail_plug-3.1.1.777fa90-2.el7.x86_64.rpm - /tmp/ansible_deploy/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm - - /tmp/ansible_deploy/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm + - /tmp/ansible_deploy/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm - /tmp/ansible_deploy/http-2.0.5.c61ad9a-2.el7.x86_64.rpm - /tmp/ansible_deploy/mail-1.0.9.c1d3bde-2.el7.x86_64.rpm - /tmp/ansible_deploy/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm - - /tmp/ansible_deploy/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm + - /tmp/ansible_deploy/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm - /tmp/ansible_deploy/tsg_conn_sketch-2.1.33.68c9aaf-2.el7.x86_64.rpm - /tmp/ansible_deploy/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm - /tmp/ansible_deploy/mesa_sip-1.1.0.cfebc76-2.el7.x86_64.rpm diff --git a/roles/firewall/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2 index 5087b35..1888f80 100644 --- a/roles/firewall/templates/main.conf.j2 +++ b/roles/firewall/templates/main.conf.j2 @@ -86,7 +86,6 @@ hos_fs2_serverport={{ firewall.hos_fs2_serverport }} [APP_SKETCH_LOCAL] LOG_LEVEL={{ firewall.APP_SKETCH_LOG_LEVEL }} LOG_PATH="{{ firewall.APP_SKETCH_LOG_PATH }}" -L7_PROTOCOL_LABEL="{{ firewall.APP_SKETCH_L7_PROTOCOL_LABEL }}" [APP_SKETCH_FEEDBACK] QOS={{ firewall.APP_SKETCH_QOS }} diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2 index 3db2ef1..e60195a 100644 --- a/roles/sapp/templates/conflist.inf.j2 +++ b/roles/sapp/templates/conflist.inf.j2 @@ -1,16 +1,9 @@ [platform] -{% if tsg_access_type == 1 %} -./plug/platform/g_device_plug/g_device_plug.inf -#./plug/platform/http_healthcheck/http_healthcheck.inf -{% else %} -#./plug/platform/g_device_plug/g_device_plug.inf -#./plug/platform/http_healthcheck/http_healthcheck.inf +{% if tsg_access_type == 2 %} +./plug/platform/http_healthcheck/http_healthcheck.inf {% endif %} ./plug/platform/app_proto_identify/app_proto_identify.inf ./plug/platform/tsg_master/tsg_master.inf -{% if tsg_app.enable == 1 %} -./plug/platform/app_master/app_master.inf -{% endif %} [protocol] ./plug/protocol/mesa_sip/mesa_sip.inf @@ -39,7 +32,4 @@ {% if tsg_app.enable == 1 %} ./plug/business/app_sketch_local/app_sketch_local.inf {% endif %} -{% if tsg_access_type == 2 %} -./plug/platform/http_healthcheck/http_healthcheck.inf -{% endif %} ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf |