From f34ec678f55235714d174b8df08b22df45491a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Vnu=C4=8Dko?= <ivan@vnucko.com>
Date: Tue, 24 Sep 2024 09:16:52 +0200
Subject: [PATCH] Fix services run commands and a typo in definition folder
 name

---
 docker/openvswitch/openvswitch-ipsec/s6-rc.d/ike_daemon/run     | 2 ++
 .../ipsec_monitor/{dependecies.d => dependencies.d}/base        | 0
 .../ipsec_monitor/{dependecies.d => dependencies.d}/ike_daemon  | 0
 .../{dependecies.d => dependencies.d}/ipsec_check_config        | 0
 .../{dependecies.d => dependencies.d}/ipsec_check_modules       | 0
 .../{dependecies.d => dependencies.d}/ipsec_check_nflog         | 0
 .../ipsec_monitor/{dependecies.d => dependencies.d}/ipsec_nss   | 0
 .../ipsec_monitor/{dependecies.d => dependencies.d}/kolla_start | 0
 docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/run  | 2 ++
 9 files changed, 4 insertions(+)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/base (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/ike_daemon (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/ipsec_check_config (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/ipsec_check_modules (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/ipsec_check_nflog (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/ipsec_nss (100%)
 rename docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/{dependecies.d => dependencies.d}/kolla_start (100%)

diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ike_daemon/run b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ike_daemon/run
index e4f0687f12..867acf1c26 100755
--- a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ike_daemon/run
+++ b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ike_daemon/run
@@ -2,5 +2,7 @@
 /usr/libexec/ipsec/pluto \
     --leak-detective \
     --config /etc/ipsec.conf \
+    --rundir /run/openvswitch \
+    --nssdir /etc/ipsec.d \
     --nofork \
     --logfile /var/log/kolla/openvswitch/pluto.log
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/base b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/base
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/base
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/base
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ike_daemon b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ike_daemon
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ike_daemon
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ike_daemon
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_config b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_config
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_config
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_config
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_modules b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_modules
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_modules
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_modules
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_nflog b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_nflog
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_check_nflog
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_check_nflog
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_nss b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_nss
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/ipsec_nss
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/ipsec_nss
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/kolla_start b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/kolla_start
similarity index 100%
rename from docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependecies.d/kolla_start
rename to docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/dependencies.d/kolla_start
diff --git a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/run b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/run
index 3b9fb69c30..e9ed5fafc8 100755
--- a/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/run
+++ b/docker/openvswitch/openvswitch-ipsec/s6-rc.d/ipsec_monitor/run
@@ -2,5 +2,7 @@
 /usr/share/openvswitch/scripts/ovs-monitor-ipsec \
     --no-restart-ike-daemon \
     --ike-daemon=libreswan \
+    --pidfile=/run/openvswitch/ovs-monitor-ipsec.pid \
+    --ipsec-ctl=/run/openvswitch/pluto.ctl \
     --log-file=/var/log/kolla/openvswitch/ovs-monitor-ipsec.log
     unix:/run/openvswitch/db.sock