From f0725b0e02d7a28ada14fed06a415a2617f053b5 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 16 Oct 2020 16:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20clotho=20=E4=B8=BA=20packa?=
 =?UTF-8?q?ge=5Fdump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group_vars/server_as_tun_mode.yml         |  2 +-
 roles/mrzcpd/tasks/main.yml                   |  2 +-
 roles/packet_dump/files/packet_dump.service   | 19 +++++++++++++++++++
 .../packet_dump/templates/packet_dump.conf.j2 |  2 +-
 uninstall/roles/packet_dump/tasks/main.yml    | 16 ++++++++++++++++
 uninstall/rpm_list.sh                         |  4 ++++
 uninstall/uninstall_tsg.yml                   |  2 ++
 7 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 roles/packet_dump/files/packet_dump.service
 create mode 100644 uninstall/roles/packet_dump/tasks/main.yml

diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index f3a8d54..f4ef823 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -60,7 +60,7 @@ pangu_log_level: DEBUG
 doh_log_level: DEBUG
 
 certstore_log_level: 10
-clotho_log_level: 10
+packet_dump_log_level: 10
 
 #########################################
 #Sapp Performance Config
diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml
index 9d74ff4..1d703de 100644
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -111,7 +111,7 @@
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined
-    - tsg_access_type == 3
+    -  == 3
 
 - name: "update mrtunnat.conf.ATCA_Vlan_Flipping"
   template:
diff --git a/roles/packet_dump/files/packet_dump.service b/roles/packet_dump/files/packet_dump.service
new file mode 100644
index 0000000..7afe11c
--- /dev/null
+++ b/roles/packet_dump/files/packet_dump.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=packet dump service
+After=After=network.target
+
+[Service]
+Type=fork
+WorkingDirectory=/home/mesasoft/packet_dump
+ExecStart=/home/mesasoft/packet_dump/packet_dump
+TimeoutSec=60s
+RestartSec=10s
+Restart=always
+LimitNOFILE=524288
+LimitNPROC=infinity
+LimitCORE=infinity
+TasksMax=infinity
+Delegate=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/packet_dump/templates/packet_dump.conf.j2 b/roles/packet_dump/templates/packet_dump.conf.j2
index 755417c..369ef83 100644
--- a/roles/packet_dump/templates/packet_dump.conf.j2
+++ b/roles/packet_dump/templates/packet_dump.conf.j2
@@ -11,4 +11,4 @@ disable_coredump=0
 enable_breakpad=1
 breakpad_minidump_dir=/tmp/packet_dump/crashreport
 enable_breakpad_upload=0
-breakpad_upload_url={{ breakpad_upload }}
+breakpad_upload_url={{ breakpad_upload_url }}
diff --git a/uninstall/roles/packet_dump/tasks/main.yml b/uninstall/roles/packet_dump/tasks/main.yml
new file mode 100644
index 0000000..74de743
--- /dev/null
+++ b/uninstall/roles/packet_dump/tasks/main.yml
@@ -0,0 +1,16 @@
+####################
+#Uninstall packet_dump
+- name: "[uninstall packet_dump] stop packet_dump"
+  systemd:
+    name: packet_dump
+    state: stopped
+    enabled: no
+  when: uninstall.packet_dump == 1
+  ignore_errors: true
+
+- name: "[uninstall packet_dump] uninstall packet_dump"
+  yum:
+    name:
+      - "{{ packet_dump }}"
+    state: absent
+  when: uninstall.packet_dump == 1
diff --git a/uninstall/rpm_list.sh b/uninstall/rpm_list.sh
index 8b6b11b..fec05cb 100755
--- a/uninstall/rpm_list.sh
+++ b/uninstall/rpm_list.sh
@@ -41,6 +41,7 @@ tfe=`rpm -qa |grep ^tfe-4`
 tfe_kmod=`rpm -qa |grep ^tfe-kmod`
 http_healthcheck=`rpm -qa |grep ^http_healthcheck`
 clotho=`rpm -qa |grep ^clotho`
+packet_dump=`rpm -qa |grep ^packet_dump`
 certstore=`rpm -qa |grep ^certstore`
 
 
@@ -125,6 +126,9 @@ http_healthcheck: $http_healthcheck
 #clotho
 clotho: $clotho
 
+#packet_dump
+packet_dump: $packet_dump
+
 #####################
 #certstore
 certstore: $certstore
diff --git a/uninstall/uninstall_tsg.yml b/uninstall/uninstall_tsg.yml
index b03ed66..0a3d730 100644
--- a/uninstall/uninstall_tsg.yml
+++ b/uninstall/uninstall_tsg.yml
@@ -17,6 +17,7 @@
     - certstore
     - cert_redis
     - clotho
+    - packet_dump
     - http_healthcheck
     - framework
     - telegraf_statistic
@@ -45,6 +46,7 @@
     - certstore
     - cert_redis
     - clotho
+    - packet_dump
     - http_healthcheck
     - framework
     - telegraf_statistic