fixed tun/tap ifaces manage

roles/install-stcp/tasks/create_stcp.yml

@@ -1,9 +1,8 @@
 ---
-- name: Copying the STCP binary file
+- block:
-  block:
     - name: Creating "{{ stcp_base_dir }}" directory
       file: path="{{ stcp_base_dir }}" state=directory
-    - name: Copying binary
+    - name: Copying the STCP binary file
       copy: 
         src: multi_srv_raw 
         dest: '{{ stcp_binary_path }}'
@@ -15,32 +14,39 @@
     dest: '{{ loop_script_path }}'
     mode: '0700'
 
-- name: Creating symlink to the STCP binary file
+- block:
-  block:
     - name: Creating STCP instance directory
       file: 
         path: '{{ stcp_instance_dir }}'
         state: directory
         mode: '0600'
-    - name: Creating symlink
+    - name: Creating symlink to the STCP binary file
       file:
         src: '{{ stcp_binary_path }}'
         dest: '{{ stcp_instance_dir }}/multi_srv_raw'
         state: link
 
-- name: Creating STCP logging file
+- block:
-  file:
+    - stat:
-    path: '{{ clients_log_file_path }}'
+        path: '{{ clients_log_file_path }}'
-    state: touch
+      register: file
-    mode: '0600'
+    - name: Creating STCP logging file
-  when: use_client_logging == true
+      file:
+        path: '{{ clients_log_file_path }}'
+        state: touch
+        mode: '0600'
+      when: use_client_logging == true and not file.stat.exists
 
-- name: Creating STCP users file
+- block:
-  file:
+    - stat:
-    path: '{{ users_file_path }}'
+        path: '{{ users_file_path }}'
-    state: touch
+      register: file
-    mode: '0600'
+    - name: Creating STCP users file
-  when: use_auth == true
+      file:
+        path: '{{ users_file_path }}'
+        state: touch
+        mode: '0600'
+      when: use_auth == true and not file.stat.exsits
 
 - name: Templating STCP server config
   template:

roles/install-stcp/tasks/handle_stcp.yml

@@ -7,3 +7,4 @@
     name: 'stcp_{{ stcp_instance_name }}'
     state: restarted
     enabled: yes
+  when: run_stcp == true

roles/install-stcp/templates/server.ini.j2

@@ -2,10 +2,14 @@
 link {{ internal_links_name }}{{ server_port + i }} {{ link_start_ip_addr | ipmath(4*i) }} {{ link_ip_mask }}
 {% endfor %}
 
-{% if en_tap_iface == true %}
+{% if stcp_mode == "tap" %}
 tap {{ tap_iface_name }} {{ tap_iface_ip_addr }} {{ tap_iface_ip_mask }}
 {% endif %}
-{% if en_tun_iface == true %}
+{% if stcp_mode == "tun" %}
+tun {{ tun_iface_name }} {{ tun_iface_ip_addr }} {{ tun_iface_ip_mask }}
+{% endif %}
+{% if stcp_mode == "tuntap" or stcp_mode == "taptun" %}
+tap {{ tap_iface_name }} {{ tap_iface_ip_addr }} {{ tap_iface_ip_mask }}
 tun {{ tun_iface_name }} {{ tun_iface_ip_addr }} {{ tun_iface_ip_mask }}
 {% endif %}
 

roles/install-stcp/vars/main.yml

@@ -6,18 +6,17 @@ links_number: 8
 link_start_ip_addr: 192.168.56.2
 link_ip_mask: 255.255.255.252
 ext_iface: eth0
-stcp_mode: tun
 stcp_runas: root
 use_auth: no
 use_client_logging: yes
+run_stcp: yes
 
+stcp_mode: tuntap
 #stcp_tuntaps
-en_tap_iface: no
 tap_iface_name: 'tap_{{ stcp_instance_name }}'
 tap_iface_ip_addr: 10.10.1.1
 tap_iface_ip_mask: 255.255.255.0
 
-en_tun_iface: yes
 tun_iface_name: 'tun_{{ stcp_instance_name }}'
 tun_iface_ip_addr: 10.11.1.1
 tun_iface_ip_mask: 255.255.255.0