From d28b8ef4d139896252f73453ba2eff5a3d010524 Mon Sep 17 00:00:00 2001
From: pengln <pengln@amonstack.com>
Date: Thu, 18 Nov 2021 15:28:21 +0800
Subject: [PATCH] =?UTF-8?q?#1001686=20role=E5=8F=98=E9=87=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAdefaults?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 playbooks/roles/filebeat/defaults/main.yml   | 21 +++++++++++++++++++-
 playbooks/roles/filebeat/vars/main.yml       | 21 --------------------
 playbooks/roles/supervisor/defaults/main.yml |  9 ++++++++-
 playbooks/roles/supervisor/vars/main.yml     |  9 ---------
 4 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 playbooks/roles/filebeat/vars/main.yml
 delete mode 100644 playbooks/roles/supervisor/vars/main.yml

diff --git a/playbooks/roles/filebeat/defaults/main.yml b/playbooks/roles/filebeat/defaults/main.yml
index 4a9a7a6..53a7342 100644
--- a/playbooks/roles/filebeat/defaults/main.yml
+++ b/playbooks/roles/filebeat/defaults/main.yml
@@ -1,2 +1,21 @@
 ---
-# defaults file for filebeat
+# vars file for filebeat
+filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz"
+work_path: "/data/opt/filebeat/{{ instance_name }}"
+gwlogs:
+  - "api"
+  - "cl*"
+  - "doc"
+  - "download"
+  - "gw*"
+  - "cp*"
+  - "pay"
+  - "static"
+  - "81"
+mgrlogs: 
+  - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
+quicklog:
+  - "/data/game/sync/quick/filebeat/*.txt"
+config_files:
+  - "gateway-nginx"
+  - "manager"
\ No newline at end of file
diff --git a/playbooks/roles/filebeat/vars/main.yml b/playbooks/roles/filebeat/vars/main.yml
deleted file mode 100644
index 53a7342..0000000
--- a/playbooks/roles/filebeat/vars/main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# vars file for filebeat
-filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz"
-work_path: "/data/opt/filebeat/{{ instance_name }}"
-gwlogs:
-  - "api"
-  - "cl*"
-  - "doc"
-  - "download"
-  - "gw*"
-  - "cp*"
-  - "pay"
-  - "static"
-  - "81"
-mgrlogs: 
-  - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
-quicklog:
-  - "/data/game/sync/quick/filebeat/*.txt"
-config_files:
-  - "gateway-nginx"
-  - "manager"
\ No newline at end of file
diff --git a/playbooks/roles/supervisor/defaults/main.yml b/playbooks/roles/supervisor/defaults/main.yml
index f9d0587..4326286 100644
--- a/playbooks/roles/supervisor/defaults/main.yml
+++ b/playbooks/roles/supervisor/defaults/main.yml
@@ -1,2 +1,9 @@
 ---
-# defaults file for supervisor
+# vars file for supervisor
+pip_bin_path: "/data/opt/python3/bin/pip"
+python_bin_dir: "/data/opt/python3/bin"
+work_path: "/data/opt/filebeat/{{ instance_name }}"
+filebeat_configs:
+  - "gateway-nginx"
+  - "manager"
+  - "quick"
diff --git a/playbooks/roles/supervisor/vars/main.yml b/playbooks/roles/supervisor/vars/main.yml
deleted file mode 100644
index 4326286..0000000
--- a/playbooks/roles/supervisor/vars/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# vars file for supervisor
-pip_bin_path: "/data/opt/python3/bin/pip"
-python_bin_dir: "/data/opt/python3/bin"
-work_path: "/data/opt/filebeat/{{ instance_name }}"
-filebeat_configs:
-  - "gateway-nginx"
-  - "manager"
-  - "quick"
-- 
2.40.1