diff --git a/modules/radix/services/admin.scm b/modules/radix/services/admin.scm index 03f3d39..bd99250 100644 --- a/modules/radix/services/admin.scm +++ b/modules/radix/services/admin.scm @@ -82,12 +82,7 @@ (plain-file "doas.conf" (apply string-append (map (lambda (statement) - (match-record - statement - #;(cond ((permit-statement? statement) ) - ((deny-statement? statement) ) - (else (error "Invalid statement in configuration" - statement))) + (match-record statement (identity as-user command args setenv keepenv? nopass? nolog? persist?) ((@@ (ice-9 format) format) #f @@ -96,7 +91,7 @@ ~:[~;nopass ~]~ ~:[~;nolog ~]~ ~:[~;persist ~]~ - ~@[setenv { ~{ ~a ~} } ~]~ + ~@[setenv {~{ ~a~} } ~]~ ~a~@[ as ~a~]~ ~@[ cmd ~a~]~ ~@[ args~{ ~a~}~]~%"