add SECRET-UPLOADED and HOST-SECRET-UPLOADED

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

2 files changed, 18 insertions, 0 deletions

diff --git a/src/package.lisp b/src/package.lisp
index 6bb1824..323af1c 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -181,6 +181,8 @@
 	   #:contains-lines
 	   #:data-uploaded
 	   #:host-data-uploaded
+	   #:secret-uploaded
+	   #:host-secret-uploaded
 	   #:regex-replaced-lines))
 
 (defpackage :consfigurator.data.asdf
diff --git a/src/property/file.lisp b/src/property/file.lisp
index 9516f7f..c398ace 100644
--- a/src/property/file.lisp
+++ b/src/property/file.lisp
@@ -55,6 +55,22 @@ point in doing that here because WRITEFILE is synchronous."
   (:apply
    (data-uploaded (get-hostname) destination destination)))
 
+(defprop secret-uploaded :posix (iden1 iden2 destination)
+  (:hostattrs
+   (declare (ignore destination))
+   (require-data iden1 iden2))
+  (:apply
+   (when (test "-e" destination)
+     (mrun "chmod" "600" destination))
+   (writefile destination (get-data-stream iden1 iden2)
+	      :try-preserve t :umask #o077)))
+
+(defprop host-secret-uploaded :posix (destination)
+  (:hostattrs
+   (require-data (get-hostname) destination))
+  (:apply
+   (secret-uploaded (get-hostname) destination destination)))
+
 (defprop regex-replaced-lines :posix (file regex replace)
   "Like s/REGEX/REPLACE/ on the lines of FILE.
 Uses CL-PPCRE:REGEX-REPLACE, which see for the syntax of REPLACE."