Merge pull request #103866 from cole-h/doas

doas: 6.6.1 -> 6.8
2020-11-30 19:02:55 +01:00
parent 9a63b3d3d6 19c0927d30
commit 6df56e1cb8
2 changed files with 14 additions and 3 deletions
--- a/nixos/modules/security/doas.nix
+++ b/nixos/modules/security/doas.nix
@@ -12,6 +12,7 @@ let

  mkOpts = rule: concatStringsSep " " [
    (optionalString rule.noPass "nopass")
+    (optionalString rule.noLog "nolog")
    (optionalString rule.persist "persist")
    (optionalString rule.keepEnv "keepenv")
    "setenv { SSH_AUTH_SOCK ${concatStringsSep " " rule.setEnv} }"
@@ -118,6 +119,16 @@ in
              '';
            };

+            noLog = mkOption {
+              type = with types; bool;
+              default = false;
+              description = ''
+                If <code>true</code>, successful executions will not be logged
+                to
+                <citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+              '';
+            };
+
            persist = mkOption {
              type = with types; bool;
              default = false;