3 files changed, 42 insertions, 42 deletions
diff --git a/data/templates/conntrackd/conntrackd.conf.tmpl b/data/templates/conntrackd/conntrackd.conf.j2
index 45b7bff09..66024869d 100644
--- a/data/templates/conntrackd/conntrackd.conf.tmpl
+++ b/data/templates/conntrackd/conntrackd.conf.j2
@@ -3,45 +3,45 @@
 # Synchronizer settings
 Sync {
     Mode FTFW {
-        DisableExternalCache {{ 'on' if disable_external_cache is defined else 'off' }}
+        DisableExternalCache {{ 'on' if disable_external_cache is vyos_defined else 'off' }}
     }
 {% for iface, iface_config in interface.items() %}
-{%   if iface_config.peer is defined and iface_config.peer is not none %}
+{%     if iface_config.peer is vyos_defined %}
     UDP {
-{%     if listen_address is defined and listen_address is not none %}
+{%         if listen_address is vyos_defined %}
         IPv4_address {{ listen_address }}
-{%     endif %}
+{%         endif %}
         IPv4_Destination_Address {{ iface_config.peer }}
-        Port {{ iface_config.port if iface_config.port is defined else '3780' }}
+        Port {{ iface_config.port if iface_config.port is vyos_defined else '3780' }}
         Interface {{ iface }}
         SndSocketBuffer {{ sync_queue_size | int *1024 *1024 }}
         RcvSocketBuffer {{ sync_queue_size | int *1024 *1024 }}
         Checksum on
     }
-{%   else %}
+{%     else %}
     Multicast {
-{%     set ip_address = iface | get_ipv4 %}
+{%         set ip_address = iface | get_ipv4 %}
         IPv4_address {{ mcast_group }}
-        Group {{ iface_config.port if iface_config.port is defined else '3780' }}
+        Group {{ iface_config.port if iface_config.port is vyos_defined else '3780' }}
         IPv4_interface {{ ip_address[0] | ip_from_cidr }}
         Interface {{ iface }}
         SndSocketBuffer {{ sync_queue_size | int *1024 *1024 }}
         RcvSocketBuffer {{ sync_queue_size | int *1024 *1024 }}
         Checksum on
     }
-{%   endif %}
+{%     endif %}
 {% endfor %}
-{% if expect_sync is defined and expect_sync is not none %}
+{% if expect_sync is vyos_defined %}
     Options {
-{%   if 'all' in expect_sync %}
+{%     if 'all' in expect_sync %}
         ExpectationSync on
-{%   else %}
+{%     else %}
         ExpectationSync {
-{%     for protocol in expect_sync %}
+{%         for protocol in expect_sync %}
             {{ protocol }}
-{%     endfor %}
+{%         endfor %}
         }
-{%   endif %}
+{%     endif %}
     }
 {% endif %}
 }
@@ -83,29 +83,29 @@ General {
     NetlinkBufferSizeMaxGrowth {{ event_listen_queue_size | int *1024 *1024 }}
     NetlinkOverrunResync off
     NetlinkEventsReliable on
-{% if ignore_address is defined or accept_protocol is defined %}
+{% if ignore_address is vyos_defined or accept_protocol is vyos_defined %}
     Filter From Userspace {
-{%   if ignore_address is defined and ignore_address is not none %}
+{%     if ignore_address is vyos_defined %}
         Address Ignore {
-{%     for address in ignore_address if address | is_ipv4 %}
+{%         for address in ignore_address if address | is_ipv4 %}
             IPv4_address {{ address }}
-{%     endfor %}
-{%     for address in ignore_address if address | is_ipv6 %}
+{%         endfor %}
+{%         for address in ignore_address if address | is_ipv6 %}
             IPv6_address {{ address }}
-{%     endfor %}
+{%         endfor %}
         }
-{%   endif %}
-{%   if accept_protocol is defined and accept_protocol is not none %}
+{%     endif %}
+{%     if accept_protocol is vyos_defined %}
         Protocol Accept {
-{%     for protocol in accept_protocol %}
-{%       if protocol == 'icmp6' %}
+{%         for protocol in accept_protocol %}
+{%             if protocol == 'icmp6' %}
             IPv6-ICMP
-{%       else %}
+{%             else %}
             {{ protocol | upper }}
-{%       endif %}
-{%     endfor %}
+{%             endif %}
+{%         endfor %}
         }
-{%   endif %}
+{%     endif %}
     }
 {% endif %}
 }
diff --git a/data/templates/conntrackd/conntrackd.op-mode.j2 b/data/templates/conntrackd/conntrackd.op-mode.j2
new file mode 100644
index 000000000..82f7e2859
--- /dev/null
+++ b/data/templates/conntrackd/conntrackd.op-mode.j2
@@ -0,0 +1,13 @@
+Source                                           Destination                                      Protocol
+{% for parsed in data if parsed.flow.meta is vyos_defined %}
+{%     for key in parsed.flow.meta %}
+{%         if key['@direction'] == 'original' %}
+{%             set saddr    = key.layer3.src | bracketize_ipv6 %}
+{%             set sport    = key.layer4.sport %}
+{%             set daddr    = key.layer3.dst | bracketize_ipv6 %}
+{%             set dport    = key.layer4.dport %}
+{%             set protocol = key.layer4['@protoname'] %}
+{{ "%-48s" | format(saddr ~ ':' ~ sport) }} {{ "%-48s" | format(daddr ~ ':' ~ dport) }} {{ protocol }}
+{%         endif %}
+{%     endfor %}
+{% endfor %}
diff --git a/data/templates/conntrackd/conntrackd.op-mode.tmpl b/data/templates/conntrackd/conntrackd.op-mode.tmpl
deleted file mode 100644
index 82a4b09ad..000000000
--- a/data/templates/conntrackd/conntrackd.op-mode.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Source                                           Destination                                      Protocol
-{% for parsed in data if parsed.flow is defined and parsed.flow.meta is defined %}
-{%   for key in parsed.flow.meta %}
-{%     if key['@direction'] == 'original' %}
-{%       set saddr    = key.layer3.src | bracketize_ipv6 %}
-{%       set sport    = key.layer4.sport %}
-{%       set daddr    = key.layer3.dst | bracketize_ipv6 %}
-{%       set dport    = key.layer4.dport %}
-{%       set protocol = key.layer4['@protoname'] %}
-{{ "%-48s" | format(saddr ~ ':' ~ sport) }} {{ "%-48s" | format(daddr ~ ':' ~ dport) }} {{ protocol }}
-{%     endif %}
-{%   endfor %}
-{% endfor %}