aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-12 12:52:54 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-12 13:04:56 -0700
commit84950a1ef418e4bb08db825ac75dfad6de9f2fcf (patch)
tree4829fae299735981be4be77829c25a6b6d302216
parentaea88b0821f247174f1a9cb5e35c8f2b82613574 (diff)
downloadconsfigurator-84950a1ef418e4bb08db825ac75dfad6de9f2fcf.tar.gz
POSTFIX:{MAIN-CONFIGURED,MAPPED-FILE}: fix returning :NO-CHANGE
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/property/postfix.lisp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/property/postfix.lisp b/src/property/postfix.lisp
index 0121a2f..ff3cc04 100644
--- a/src/property/postfix.lisp
+++ b/src/property/postfix.lisp
@@ -31,8 +31,9 @@
"Set key--value pairs in /etc/postfix/main.cf."
(:desc (format nil "Postfix main.cf configured ~{~A=~A~^, ~}" pairs))
(:apply
- (or (eql :no-change
+ (if (eql :no-change
(apply #'file:contains-conf-equals "/etc/postfix/main.cf" pairs))
+ :no-change
(reloaded))))
(define-function-property-combinator mapped-file
@@ -45,7 +46,8 @@ defaults to the first argument to propapp."
:hostattrs (get (car propapp) 'hostattrs)
:apply (lambda (&rest args)
(when-let ((f (get (car propapp) 'papply)))
- (or (eql :no-change (apply f args))
+ (if (eql :no-change (apply f args))
+ :no-change
(mrun "postmap" file))))
:unapply
(lambda (&rest args)