From 05164a19652f9b0e7ed70f7030235b048dc4dad7 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat, 30 Oct 2021 16:05:25 -0700
Subject: rename FIREWALLD:ZONE-DIRECT-RULE -> FIREWALLD:DIRECT-RULE

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---
 src/package.lisp            | 2 +-
 src/property/firewalld.lisp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/package.lisp b/src/package.lisp
index 7692bc3..08fd65e 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -861,7 +861,7 @@
            #:zone-has-service
            #:zone-masquerade
            #:zone-rich-rule
-           #:zone-direct-rule
+           #:direct-rule
            #:default-zone))
 
 (defpackage :consfigurator.property.timezone
diff --git a/src/property/firewalld.lisp b/src/property/firewalld.lisp
index e71473d..ee69cb5 100644
--- a/src/property/firewalld.lisp
+++ b/src/property/firewalld.lisp
@@ -277,10 +277,13 @@ only FIREWALLD:DEFAULT-ZONE."
      :check `(,#?"--zone=${zone}" ,#?"--query-rich-rule=${rule}")
      :apply `(,#?"--zone=${zone}" ,#?"--remove-rich-rule=${rule}"))))
 
+
+;;;; Other daemon configuration
+
 ;; Note that direct rules will be deprecated as of firewalld 1.0.0, as
 ;; policies and rich rules should be able to cover all uses of direct rules.
 ;;     <https://firewalld.org/2021/06/the-upcoming-1-0-0>
-(defpropspec zone-direct-rule :posix (&rest rule-args)
+(defpropspec direct-rule :posix (&rest rule-args)
   (:desc #?"firewalld has direct rule \"@{rule-args}\"")
   `(with-unapply
      (installed)
@@ -293,9 +296,6 @@ only FIREWALLD:DEFAULT-ZONE."
                       :check ("--direct" "--query-rule" ,@rule-args)
                       :apply ("--direct" "--remove-rule" ,@rule-args))))
 
-
-;;;; Daemon configuration
-
 (defproplist default-zone :posix (zone)
   (:desc #?"firewalld default zone is ${zone}")
   (installed)
-- 
cgit v1.2.3