From 1158efbaa439ad61fa78ab2f7fc66262f5b6f81a Mon Sep 17 00:00:00 2001
From: Ray Miller <ray@1729.org.uk>
Date: Mon, 23 Jun 2025 10:12:03 +0100
Subject: [PATCH] Bugfix systemctl, update example

---
 examples/forgejo.scm                        | 44 ++++++++++-----------
 ordo/action/{systemcl.scm => systemctl.scm} | 10 ++---
 2 files changed, 26 insertions(+), 28 deletions(-)
 rename ordo/action/{systemcl.scm => systemctl.scm} (85%)

diff --git a/examples/forgejo.scm b/examples/forgejo.scm
index 2f3dff5..bada9dd 100644
--- a/examples/forgejo.scm
+++ b/examples/forgejo.scm
@@ -7,46 +7,44 @@
   (list
    (task "Install configuration directory"
          #:action fs:install-dir
-         #:args '((#:path . "/etc/forgejo"))
+         #:args '(#:path "/etc/forgejo")
          #:trigger '("Restart pod"))
    (task "Install timezone configuration"
          #:action fs:install-file
-         #:args '((#:path . "/etc/forgejo/timezone")
-                  (#:local-src . "files/timezone"))
+         #:args '(#:path "/etc/forgejo/timezone" #:local-src "files/timezone")
          #:trigger '("Restart pod"))
    (task "Install localtime configuration"
          #:action fs:install-file
-         #:args '((#:path . "/etc/forgejo/localtime")
-                  (#:local-src . "files/localtime")))
+         #:args '(#:path "/etc/forgejo/localtime" #:local-src "files/localtime")
+         #:trigger '("Restart pod"))
    (task "Create data volume quadlet"
          #:action quadlet:create-volume
-         #:args '((#:name . "forgejo")
-                  (#:description . "Forgejo data volume"))
+         #:args '(#:name "forgejo" #:description "Forgejo data volume")
          #:trigger '("Reload systemd" "Restart pod"))
    (task "Create pod quadlet"
          #:action quadlet:create-pod
-         #:args '((#:name . "forgejo")
-                  (#:quadlet-options . ((PodName . "forge")
-                                        (Volume . "forgejo.volume:U,Z")
-                                        (PodmanArgs . "--userns auto"))))
+         #:args '(#:name  "forgejo"
+                  #:pod  ((PodName . "forge")
+                          (Volume . "forgejo.volume:U,Z")
+                          (PodmanArgs . "--userns auto")))
          #:trigger '("Reload systemd" "Restart pod"))
    (task "Create image quadlet"
          #:action quadlet:create-image
-         #:args `((#:name . "forgejo")
-                  (#:image . (Image . ,(format #f "codeberg.org/forgejo/forgejo:~a" version))))
+         #:args `(#:name "forgejo"
+                  #:image (Image . ,(format #f "codeberg.org/forgejo/forgejo:~a" version)))
          #:trigger '("Reload systemd" "Restart pod"))
    (task "Create container quadlet"
          #:action quadlet:create-container
-         #:args '((#:name . "forgejo")
-                  (#:container . ((Pod . "forgejo.pod")
-                                  (Image . "forgejo.image")
-                                  (Network . "services.network")
-                                  (Volume . "/etc/forgejo/timezone:/etc/timezone:ro,U,Z")
-                                  (Volume . "/etc/forgejo/localtime:/etc/localtime:ro,U,Z")
-                                  (Environment . "USER_UID=1000")
-                                  (Environment . "USER_GID=1000")
-                                  (Environment . "FORGEJO__service__DISABLE_REGISTRATION=true")
-                                  (Environment . "FORGEJO__webhook__ALLOWED_HOST_LIST=private"))))
+         #:args '(#:name  "forgejo"
+                  #:container ((Pod . "forgejo.pod")
+                               (Image . "forgejo.image")
+                               (Network . "services.network")
+                               (Volume . "/etc/forgejo/timezone:/etc/timezone:ro,U,Z")
+                               (Volume . "/etc/forgejo/localtime:/etc/localtime:ro,U,Z")
+                               (Environment . "USER_UID=1000")
+                               (Environment . "USER_GID=1000")
+                               (Environment . "FORGEJO__service__DISABLE_REGISTRATION=true")
+                               (Environment . "FORGEJO__webhook__ALLOWED_HOST_LIST=private")))
          #:trigger '("Reload systemd" "Restart pod"))
    (handler "Reload systemd"
             #:action systemctl:daemon-reload)
diff --git a/ordo/action/systemcl.scm b/ordo/action/systemctl.scm
similarity index 85%
rename from ordo/action/systemcl.scm
rename to ordo/action/systemctl.scm
index 14da223..d8b5eeb 100644
--- a/ordo/action/systemcl.scm
+++ b/ordo/action/systemctl.scm
@@ -19,22 +19,22 @@ this program. If not, see <https://www.gnu.org/licenses/>.
   #:use-module (ordo connection)
   #:export (daemon-reload stop start restart reload))
 
-(define (daemon-reload conn #:key user?)
+(define* (daemon-reload conn #:key user?)
   (remote-cmd conn "systemctl" (when user? "--user") "daemon-reload" #:check? #t)
   #t)
 
-(define (stop conn #:key unit user?)
+(define* (stop conn #:key unit user?)
   (remote-cmd conn "systemctl" (when user? "--user") "stop" unit #:check? #t)
   #t)
 
-(define (start conn #:key unit user?)
+(define* (start conn #:key unit user?)
   (remote-cmd conn "systemctl" (when user? "--user") "start" unit #:check? #t)
   #t)
 
-(define (reload conn #:key unit user?)
+(define* (reload conn #:key unit user?)
   (remote-cmd conn "systemctl" (when user? "--user") "reload" unit #:check? #t)
   #t)
 
-(define (restart conn #:key unit user?)
+(define* (restart conn #:key unit user?)
   (remote-cmd conn "systemctl" (when user? "--user") "restart" unit #:check? #t)
   #t)