Unverified Commit 01898764 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: replace "yes" else "no" usages to lib.boolToYesNo (#442387)

parents 5fbf3164 80f12557

nixos/modules/config/getaddrinfo.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ let 
    [

      "# Generated by NixOS module networking.getaddrinfo"

      "# Do not edit manually!"

      "reload ${if cfg.reload then "yes" else "no"}"

      "reload ${lib.boolToYesNo cfg.reload}"

    ]

    ++ formatTableEntries "label" cfg.label

    ++ formatTableEntries "precedence" cfg.precedence

nixos/modules/misc/locate.nix

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ in 
        PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}"

        PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}"

        PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}"

        PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}"

        PRUNE_BIND_MOUNTS="${lib.boolToYesNo cfg.pruneBindMounts}"

      '';



      systemPackages = [ cfg.package ];
@@ -267,7 +267,7 @@ in 
        ''

          exec ${cfg.package}/bin/updatedb \

            --output ${toString cfg.output} ${lib.concatStringsSep " " args} \

            --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \

            --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \

            ${lib.concatStringsSep " " cfg.extraFlags}

        '';

      serviceConfig = {

nixos/modules/programs/ssh.nix

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ in 
      ]

      ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"

      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"

      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"

      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}"

      ++ lib.optional (

        cfg.pubkeyAcceptedKeyTypes != [ ]

      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"

nixos/modules/security/auditd.nix

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ let 
  prepareConfigValue =

    v:

    if lib.isBool v then

      (if v then "yes" else "no")

      lib.boolToYesNo v

    else if lib.isList v then

      lib.concatStringsSep " " (map prepareConfigValue v)

    else

nixos/modules/security/duosec.nix

+6 −7
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
}:

let

  cfg = config.security.duosec;



  boolToStr = b: if b then "yes" else "no";

  inherit (lib) boolToYesNo;



  configFilePam = ''

    [duo]
@@ -15,15 +14,15 @@ let 
    host=${cfg.host}

    ${lib.optionalString (cfg.groups != "") ("groups=" + cfg.groups)}

    failmode=${cfg.failmode}

    pushinfo=${boolToStr cfg.pushinfo}

    autopush=${boolToStr cfg.autopush}

    pushinfo=${boolToYesNo cfg.pushinfo}

    autopush=${boolToYesNo cfg.autopush}

    prompts=${toString cfg.prompts}

    fallback_local_ip=${boolToStr cfg.fallbackLocalIP}

    fallback_local_ip=${boolToYesNo cfg.fallbackLocalIP}

  '';



  configFileLogin = configFilePam + ''

    motd=${boolToStr cfg.motd}

    accept_env_factor=${boolToStr cfg.acceptEnvFactor}

    motd=${boolToYesNo cfg.motd}

    accept_env_factor=${boolToYesNo cfg.acceptEnvFactor}

  '';

in

{