summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/dhcp-server/kea-dhcp4.conf.j22
-rw-r--r--data/templates/dhcp-server/kea-dhcp6.conf.j22
-rwxr-xr-xsrc/conf_mode/system_conntrack.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/dhcp-server/kea-dhcp4.conf.j2 b/data/templates/dhcp-server/kea-dhcp4.conf.j2
index 29cf5e082..2e10d58e0 100644
--- a/data/templates/dhcp-server/kea-dhcp4.conf.j2
+++ b/data/templates/dhcp-server/kea-dhcp4.conf.j2
@@ -11,7 +11,7 @@
"interfaces": [ "*" ],
"dhcp-socket-type": "raw",
{% endif %}
- "service-sockets-max-retries": 5,
+ "service-sockets-max-retries": 60,
"service-sockets-retry-wait-time": 5000
},
"control-socket": {
diff --git a/data/templates/dhcp-server/kea-dhcp6.conf.j2 b/data/templates/dhcp-server/kea-dhcp6.conf.j2
index 2f0de6b30..4745d693c 100644
--- a/data/templates/dhcp-server/kea-dhcp6.conf.j2
+++ b/data/templates/dhcp-server/kea-dhcp6.conf.j2
@@ -6,7 +6,7 @@
{% else %}
"interfaces": [ "*" ],
{% endif %}
- "service-sockets-max-retries": 5,
+ "service-sockets-max-retries": 60,
"service-sockets-retry-wait-time": 5000
},
"control-socket": {
diff --git a/src/conf_mode/system_conntrack.py b/src/conf_mode/system_conntrack.py
index 2529445bf..f25ed8d10 100755
--- a/src/conf_mode/system_conntrack.py
+++ b/src/conf_mode/system_conntrack.py
@@ -258,6 +258,8 @@ def apply(conntrack):
if 'log' in conntrack:
call(f'systemctl restart vyos-conntrack-logger.service')
+ else:
+ call(f'systemctl stop vyos-conntrack-logger.service')
return None