diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-01 13:08:02 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-01 15:47:54 -0700 |
| commit | d1d43ccbef97abd541ebddb21342439cb6f88f3d (patch) | |
| tree | f51227b3ee4cb2894a2147b9176abe80d41b3362 | |
| parent | 70521cc0b6c862af70f0bb8f1f801d3e0b5bf4d2 (diff) | |
| download | consfigurator-d1d43ccbef97abd541ebddb21342439cb6f88f3d.tar.gz | |
rename CONTAINS-FOO-CONF -> CONTAINS-CONF-FOO
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | src/package.lisp | 6 | ||||
| -rw-r--r-- | src/property/file.lisp | 6 | ||||
| -rw-r--r-- | src/property/sshd.lisp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/package.lisp b/src/package.lisp index f9b7172..c533e4a 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -223,9 +223,9 @@ #:host-data-uploaded #:secret-uploaded #:host-secret-uploaded - #:contains-equals-conf - #:contains-space-conf - #:contains-shell-conf + #:contains-conf-equals + #:contains-conf-space + #:contains-conf-shell #:contains-ini-settings #:regex-replaced-lines #:directory-exists)) diff --git a/src/property/file.lisp b/src/property/file.lisp index 3c3e5f3..0b61865 100644 --- a/src/property/file.lisp +++ b/src/property/file.lisp @@ -241,7 +241,7 @@ Other arguments: finally (return (nconc new-lines accum))))) args)))) -(defprop contains-space-conf :posix (file &rest pairs) +(defprop contains-conf-space :posix (file &rest pairs) "Where FILE is a config file in which keys and values are separated by spaces and there are no sections, and PAIRS is a list of even length of alternating keys and values, set each of these keys and values in FILE. @@ -254,7 +254,7 @@ uncommented and used to set the value, if it exists." :parse-kv #?/^(\S+) (.+)/ :new-kv (lambda (k v) #?"${k} ${v}")))) -(defprop contains-equals-conf :posix (file &rest pairs) +(defprop contains-conf-equals :posix (file &rest pairs) "Where FILE is a config file in which keys and values are separated by \" = \" and there are no sections, and PAIRS is a list of even length of alternating keys and values, set each of these keys and values in FILE. @@ -267,7 +267,7 @@ uncommented and used to set the value, if it exists." :parse-kv #?/^(\S+) = (.+)/ :new-kv (lambda (k v) #?"${k} = ${v}")))) -(defprop contains-shell-conf :posix (file &rest pairs) +(defprop contains-conf-shell :posix (file &rest pairs) "Where FILE is a shell config file, like those in /etc/default, and PAIRS is a list of even length of alternating keys and values, set each of these keys and values in FILE. diff --git a/src/property/sshd.lisp b/src/property/sshd.lisp index f24d837..8120147 100644 --- a/src/property/sshd.lisp +++ b/src/property/sshd.lisp @@ -28,4 +28,4 @@ "Set key--value pairs in /etc/ssh/sshd_config." (:desc (format nil "sshd configured ~{~A ~A~^, ~}" pairs)) (:apply - (apply #'file:contains-space-conf "/home/spwhitton/tmp/config" pairs))) + (apply #'file:contains-conf-space "/home/spwhitton/tmp/config" pairs))) |