From 83ec431641d399adade70c244a99bcb9579c2fbf Mon Sep 17 00:00:00 2001
From: Beth <ejparker@actcur.com>
Date: Sun, 23 Mar 2025 06:35:03 -0500
Subject: [PATCH] fixed directory definitions and added fix_dhcp script

---
 scripts/create.sh                     |  2 +-
 scripts/fix_dhcp.sh                   | 15 +++++++++++++++
 scripts/shared_scripts/build_dhcp.sh  |  2 +-
 scripts/shared_scripts/update_dhcp.sh |  4 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 scripts/fix_dhcp.sh

diff --git a/scripts/create.sh b/scripts/create.sh
index ba8fa2b..d094581 100644
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -8,7 +8,7 @@ root_disk=10
 variant="archlinux"
 path="default"
 dhcp_opts=""
-ssh_key_dir="../identity_files"
+ssh_key_dir="../../identity_files"
 mac=52:54:00:`openssl rand -hex 1`:`openssl rand -hex 1`:`openssl rand -hex 1`
 branch="prod"
 
diff --git a/scripts/fix_dhcp.sh b/scripts/fix_dhcp.sh
new file mode 100644
index 0000000..c4acda8
--- /dev/null
+++ b/scripts/fix_dhcp.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+cd "$(dirname "$(readlink -f "$0")")"
+
+ssh_key_dir="../../identity_files/"
+dhcp_dir="../../dhcp_files"
+
+# build dhcp
+./shared_scripts/build_dhcp.sh > /tmp/dhcp
+
+# copy dhcp file to router
+scp -i $ssh_key_dir/id_router -O /tmp/dhcp r.actcur.com:/etc/config/dhcp
+# remove active leases for ip
+ssh -i $ssh_key_dir/id_router r.actcur.com "sed -i '/$ip/d' /tmp/dhcp.leases"
+# restart dnsmasq
+ssh -i $ssh_key_dir/id_router r.actcur.com 'service dnsmasq restart'
diff --git a/scripts/shared_scripts/build_dhcp.sh b/scripts/shared_scripts/build_dhcp.sh
index b0edb0a..cfbb5a5 100755
--- a/scripts/shared_scripts/build_dhcp.sh
+++ b/scripts/shared_scripts/build_dhcp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 cd "$(dirname "$(readlink -f "$0")")"
-dhcp_dir="../../dhcp_files"
+dhcp_dir="../../../dhcp_files"
 
 # use files to build dhcp config file
 cat $dhcp_dir/base
diff --git a/scripts/shared_scripts/update_dhcp.sh b/scripts/shared_scripts/update_dhcp.sh
index fe802c4..84ad11e 100755
--- a/scripts/shared_scripts/update_dhcp.sh
+++ b/scripts/shared_scripts/update_dhcp.sh
@@ -4,8 +4,8 @@ mac=52:54:00:`openssl rand -hex 1`:`openssl rand -hex 1`:`openssl rand -hex 1`
 subnet="172.16.99"
 ip=generate
 
-ssh_key_dir="../../identity_files/"
-dhcp_dir="../../dhcp_files"
+ssh_key_dir="../../../identity_files/"
+dhcp_dir="../../../dhcp_files"
 
 usage="$(basename "$0") [options] server_name
 where: