From beb4590a5d1576af6e839423d6235734b1dd97e1 Mon Sep 17 00:00:00 2001
From: zhangzhihan <zhangzhihan@zdjizhi.com>
Date: Wed, 1 Apr 2020 10:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8C=E8=87=82=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/firewall/tasks/main.yml                  | 14 ++++++++++++++
 .../{sapp => firewall}/templates/maat.conf.j2  |  0
 .../{sapp => firewall}/templates/main.conf.j2  |  0
 roles/sapp/tasks/main.yml                      | 18 +++++-------------
 4 files changed, 19 insertions(+), 13 deletions(-)
 rename roles/{sapp => firewall}/templates/maat.conf.j2 (100%)
 rename roles/{sapp => firewall}/templates/main.conf.j2 (100%)

diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 8ffef49..df9a0af 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -73,3 +73,17 @@
       - /tmp/ansible_deploy/tsg_master-debug-1.0.1.f624b67-1.el7.centos.x86_64.rpm
     state: present
   when: install_tsg_master == "yes" 
+
+- name: Template the tsgconf/main.conf
+  template:
+    src: "{{ role_path }}/templates/main.conf.j2"
+    dest: /home/mesasoft/sapp_run/tsgconf/main.conf
+  tags: template
+
+
+- name: Template the tsgconf/maat.conf
+  template:
+    src: "{{ role_path }}/templates/maat.conf.j2"
+    dest: /home/mesasoft/sapp_run/tsgconf/maat.conf
+  tags: template
+
diff --git a/roles/sapp/templates/maat.conf.j2 b/roles/firewall/templates/maat.conf.j2
similarity index 100%
rename from roles/sapp/templates/maat.conf.j2
rename to roles/firewall/templates/maat.conf.j2
diff --git a/roles/sapp/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2
similarity index 100%
rename from roles/sapp/templates/main.conf.j2
rename to roles/firewall/templates/main.conf.j2
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index 131d5b1..54b70b4 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -10,6 +10,11 @@
       - /tmp/ansible_deploy/sapp-4.0.5.3385992-1.el7.x86_64.rpm
     state: present
 
+- name: make dir
+  file:
+    path: /home/mesasoft/sapp_run/tsgconf
+    state: directory
+
 - name: Template the sapp.toml
   template:
     src: "{{ role_path }}/templates/sapp.toml.j2"
@@ -34,19 +39,6 @@
     dest: /home/mesasoft/sapp_run/etc/gdev.conf
   tags: template
   
-- name: Template the tsgconf/main.conf
-  template:
-    src: "{{ role_path }}/templates/main.conf.j2"
-    dest: /home/mesasoft/sapp_run/tsgconf/main.conf
-  tags: template
-
-
-- name: Template the tsgconf/maat.conf
-  template:
-    src: "{{ role_path }}/templates/maat.conf.j2"
-    dest: /home/mesasoft/sapp_run/tsgconf/maat.conf
-  tags: template
-
 - name: "enable sapp"
   systemd:
     name: sapp