From 6cec6f93ddeaa78186ef4e46d199bd5ce1b2b638 Mon Sep 17 00:00:00 2001
From: Miguel Angel Nubla <miguelangel.nubla@gmail.com>
Date: Tue, 7 Mar 2023 01:18:34 +0100
Subject: [PATCH] Refactor scripts

---
 step-ca-client/apparmor.txt                                 | 6 +++---
 .../rootfs/etc/s6-overlay/s6-rc.d/renewal-daemon/run        | 4 ++--
 .../usr/bin/{create_with_token.sh => create-with-token.sh}  | 2 +-
 .../bin/{reload_certificates.sh => reload-certificates.sh}  | 0
 .../rootfs/usr/bin/{renewal_daemon.sh => renewal-daemon.sh} | 2 +-
 step-ca-client/rootfs/usr/bin/{root_ca.sh => root-ca.sh}    | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename step-ca-client/rootfs/usr/bin/{create_with_token.sh => create-with-token.sh} (95%)
 rename step-ca-client/rootfs/usr/bin/{reload_certificates.sh => reload-certificates.sh} (100%)
 rename step-ca-client/rootfs/usr/bin/{renewal_daemon.sh => renewal-daemon.sh} (91%)
 rename step-ca-client/rootfs/usr/bin/{root_ca.sh => root-ca.sh} (100%)

diff --git a/step-ca-client/apparmor.txt b/step-ca-client/apparmor.txt
index 3379e2a..e4eeeee 100644
--- a/step-ca-client/apparmor.txt
+++ b/step-ca-client/apparmor.txt
@@ -57,10 +57,10 @@ profile step-ca-client flags=(attach_disconnected,mediate_deleted) {
     /proc/*/cpuset r,
 
     # Access to the helper scripts
-    /usr/bin/create_with_token.sh ix,
-    /usr/bin/reload_certificates.sh ix,
+    /usr/bin/create-with-token.sh ix,
+    /usr/bin/reload-certificates.sh ix,
     /usr/bin/renewal-daemon.sh ix,
-    /usr/bin/root_ca.sh ix,
+    /usr/bin/root-ca.sh ix,
 
     # Access network
     /sys/devices/virtual/dmi/id/product_uuid r,
diff --git a/step-ca-client/rootfs/etc/s6-overlay/s6-rc.d/renewal-daemon/run b/step-ca-client/rootfs/etc/s6-overlay/s6-rc.d/renewal-daemon/run
index 9b7d871..9e5896d 100755
--- a/step-ca-client/rootfs/etc/s6-overlay/s6-rc.d/renewal-daemon/run
+++ b/step-ca-client/rootfs/etc/s6-overlay/s6-rc.d/renewal-daemon/run
@@ -10,10 +10,10 @@ sleep 2 # give time to logging to flush and not be mixed
 
 
 bashio::log.info "Starting step-ca-client"
-/usr/bin/root_ca.sh
+/usr/bin/root-ca.sh
 
 if ! $(step certificate verify "/ssl/$(bashio::config 'certfile')" -roots=/root/.step/certs/root_ca.crt); then
-    /usr/bin/create_with_token.sh
+    /usr/bin/create-with-token.sh
 fi
 
 bashio::log.info "Starting renewal daemon..."
diff --git a/step-ca-client/rootfs/usr/bin/create_with_token.sh b/step-ca-client/rootfs/usr/bin/create-with-token.sh
similarity index 95%
rename from step-ca-client/rootfs/usr/bin/create_with_token.sh
rename to step-ca-client/rootfs/usr/bin/create-with-token.sh
index 3a21548..ed5a146 100755
--- a/step-ca-client/rootfs/usr/bin/create_with_token.sh
+++ b/step-ca-client/rootfs/usr/bin/create-with-token.sh
@@ -14,4 +14,4 @@ step ca certificate --kty=RSA -f \
 --token="$(bashio::config 'token')" \
 "$(bashio::config 'subjects' | head -1)" "/ssl/$(bashio::config 'certfile')" "/ssl/$(bashio::config 'keyfile')"
 
-/usr/bin/reload_certificates.sh
+/usr/bin/reload-certificates.sh
diff --git a/step-ca-client/rootfs/usr/bin/reload_certificates.sh b/step-ca-client/rootfs/usr/bin/reload-certificates.sh
similarity index 100%
rename from step-ca-client/rootfs/usr/bin/reload_certificates.sh
rename to step-ca-client/rootfs/usr/bin/reload-certificates.sh
diff --git a/step-ca-client/rootfs/usr/bin/renewal_daemon.sh b/step-ca-client/rootfs/usr/bin/renewal-daemon.sh
similarity index 91%
rename from step-ca-client/rootfs/usr/bin/renewal_daemon.sh
rename to step-ca-client/rootfs/usr/bin/renewal-daemon.sh
index dc2e181..959c0b0 100755
--- a/step-ca-client/rootfs/usr/bin/renewal_daemon.sh
+++ b/step-ca-client/rootfs/usr/bin/renewal-daemon.sh
@@ -9,5 +9,5 @@
 set -e
 
 step ca renew --daemon -f \
---exec="/usr/bin/reload_certificates.sh" \
+--exec="/usr/bin/reload-certificates.sh" \
 "/ssl/$(bashio::config 'certfile')" "/ssl/$(bashio::config 'keyfile')"
diff --git a/step-ca-client/rootfs/usr/bin/root_ca.sh b/step-ca-client/rootfs/usr/bin/root-ca.sh
similarity index 100%
rename from step-ca-client/rootfs/usr/bin/root_ca.sh
rename to step-ca-client/rootfs/usr/bin/root-ca.sh