update

3 files changed, 12 insertions, 4 deletions

diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index 64ffe65..cdbdbe7 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -41,10 +41,10 @@
   when: tsg_access_type == 1
   
 
-- name: "copy sapp.service destination server"
-  copy:
-    src: "{{ role_path }}/files/sapp.service"
-    dest: /usr/lib/systemd/system/
+- name: "Template sapp.service destination server"
+  template:
+    src: "{{ role_path }}/templates/sapp.service.j2"
+    dest: /usr/lib/systemd/system/sapp.service
     mode: 0755
 
 - name: "enable sapp"
diff --git a/roles/sapp/templates/gdev.conf.j2 b/roles/sapp/templates/gdev.conf.j2
index e5ce624..f395dff 100644
--- a/roles/sapp/templates/gdev.conf.j2
+++ b/roles/sapp/templates/gdev.conf.j2
@@ -1,5 +1,11 @@
 [Module]
+{% if tsg_running_type == 2 %}
 pcapdevice={{ nic_data_incoming.name }}
 sendto_gdev_card={{ nic_data_incoming.name }}
 sendto_gdev_ip={{ inline_device_config.ip }}
+{% else %}
+pcapdevice={{ inline_device_config.data_incoming }}
+sendto_gdev_card={{ inline_device_config.data_incoming }}
+sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
+{% endif %}
 gdev_status_switch=1
diff --git a/roles/sapp/files/sapp.service b/roles/sapp/templates/sapp.service.j2
index db84b61..e55f2fc 100755
--- a/roles/sapp/files/sapp.service
+++ b/roles/sapp/templates/sapp.service.j2
@@ -1,7 +1,9 @@
 [Unit]
 Description=sapp service
+{% if tsg_running_type != 0 %}
 Requires=mrzcpd.service
 After=mrzcpd.service
+{% endif %}
 [Service]
 WorkingDirectory=/home/mesasoft/sapp_run
 ExecStart=/home/mesasoft/sapp_run/sapp