From 95bbbb8bed92a60a320ff255c8b8656145f3c540 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 24 Jun 2021 19:40:36 +0200 Subject: ipsec: T3643: move swanctl.conf to /run This is the completion of commit 50a742b5 ("IPSec: T3643: Fix path for swanctl.conf file") that moves the generated swanctl file from non-volatile to a volatile (tmpfs backed) storage like we do for all out configuration files. Thus it is ensured after a reboot or service deprecation there are no accidential leftovers from previous configurations stored on the system. --- smoketest/scripts/cli/test_vpn_ipsec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'smoketest') diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py index b27ed3ca5..b7e9d8dcf 100755 --- a/smoketest/scripts/cli/test_vpn_ipsec.py +++ b/smoketest/scripts/cli/test_vpn_ipsec.py @@ -28,7 +28,7 @@ nhrp_path = ['protocols', 'nhrp'] base_path = ['vpn', 'ipsec'] dhcp_waiting_file = '/tmp/ipsec_dhcp_waiting' -swanctl_file = '/etc/swanctl/swanctl.conf' +swanctl_file = '/run/swanctl/swanctl.conf' class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): def tearDown(self): @@ -250,7 +250,7 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): 'secret = secret' ] - tmp_swanctl_conf = read_file('/etc/swanctl/swanctl.conf') + tmp_swanctl_conf = read_file(swanctl_file) for line in swanctl_lines: self.assertIn(line, tmp_swanctl_conf) -- cgit v1.2.3