From 6b8ff2e8a847841ca632ea2611a7ed16f9abdfea Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 10 Jun 2021 19:07:22 +0200
Subject: ipsec: T2816: add .py extenstion to dhclient helper script for
 processing

dhclient fails to execute the script without the extension.
---
 .../dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook | 46 ----------------------
 .../dhclient-exit-hooks.d/ipsec-dhclient-hook.py   | 46 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
 create mode 100644 src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook.py

(limited to 'src')

diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
deleted file mode 100644
index 36edf04f3..000000000
--- a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-from vyos.util import call
-
-IPSEC_CONF="/etc/ipsec.conf"
-IPSEC_SECRETS="/etc/ipsec.secrets"
-
-def getlines(file):
-    with open(file, 'r') as f:
-        return f.readlines()
-
-def writelines(file, lines):
-    with open(file, 'w') as f:
-        f.writelines(lines)
-
-if __name__ == '__main__':
-    interface = os.getenv('interface')
-    new_ip = os.getenv('new_ip_address')
-    old_ip = os.getenv('old_ip_address')
-    reason = os.getenv('reason')
-
-    if (old_ip == new_ip and reason != 'BOUND') or reason in ['REBOOT', 'EXPIRE']:
-        sys.exit(0)
-
-    conf_lines = getlines(IPSEC_CONF)
-    secrets_lines = getlines(IPSEC_SECRETS)
-    found = False
-    to_match = f'# dhcp:{interface}'
-
-    for i, line in enumerate(conf_lines):
-        if line.find(to_match) > 0:
-            conf_lines[i] = line.replace(old_ip, new_ip)
-            found = True
-
-    for i, line in enumerate(secrets_lines):
-        if line.find(to_match) > 0:
-            secrets_lines[i] = line.replace(old_ip, new_ip)
-
-    if found:
-        writelines(IPSEC_CONF, conf_lines)
-        writelines(IPSEC_SECRETS, secrets_lines)
-        call('sudo /usr/sbin/ipsec rereadall')
-        call('sudo /usr/sbin/ipsec reload')
diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook.py b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook.py
new file mode 100644
index 000000000..36edf04f3
--- /dev/null
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+from vyos.util import call
+
+IPSEC_CONF="/etc/ipsec.conf"
+IPSEC_SECRETS="/etc/ipsec.secrets"
+
+def getlines(file):
+    with open(file, 'r') as f:
+        return f.readlines()
+
+def writelines(file, lines):
+    with open(file, 'w') as f:
+        f.writelines(lines)
+
+if __name__ == '__main__':
+    interface = os.getenv('interface')
+    new_ip = os.getenv('new_ip_address')
+    old_ip = os.getenv('old_ip_address')
+    reason = os.getenv('reason')
+
+    if (old_ip == new_ip and reason != 'BOUND') or reason in ['REBOOT', 'EXPIRE']:
+        sys.exit(0)
+
+    conf_lines = getlines(IPSEC_CONF)
+    secrets_lines = getlines(IPSEC_SECRETS)
+    found = False
+    to_match = f'# dhcp:{interface}'
+
+    for i, line in enumerate(conf_lines):
+        if line.find(to_match) > 0:
+            conf_lines[i] = line.replace(old_ip, new_ip)
+            found = True
+
+    for i, line in enumerate(secrets_lines):
+        if line.find(to_match) > 0:
+            secrets_lines[i] = line.replace(old_ip, new_ip)
+
+    if found:
+        writelines(IPSEC_CONF, conf_lines)
+        writelines(IPSEC_SECRETS, secrets_lines)
+        call('sudo /usr/sbin/ipsec rereadall')
+        call('sudo /usr/sbin/ipsec reload')
-- 
cgit v1.2.3