commit dbbd289982ba87aea30453b1e6fb37f33e6bdb72 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/databases/foundationdb.nix

···

       233
        
                   type = types.str;

     

       234
        
                   default = "Check.Valid=1,Check.Unexpired=1";

     

       235
        
                   description = ''

     

       236
       -
       	      "Peer verification string". This may be used to adjust which TLS

     

       237
        
                     client certificates a server will accept, as a form of user

     

       238
        
                     authorization; for example, it may only accept TLS clients who

     

       239
        
                     offer a certificate abiding by some locality or organization name.

···

       233
        
                   type = types.str;

     

       234
        
                   default = "Check.Valid=1,Check.Unexpired=1";

     

       235
        
                   description = ''

     

       236
       +
                     "Peer verification string". This may be used to adjust which TLS

     

       237
        
                     client certificates a server will accept, as a form of user

     

       238
        
                     authorization; for example, it may only accept TLS clients who

     

       239
        
                     offer a certificate abiding by some locality or organization name.

+1 -1

nixos/modules/services/mail/rspamd.nix

···

       408
        
         };

     

       409
        
         imports = [

     

       410
        
           (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]

     

       411
       -
       	     "Socket activation never worked correctly and could at this time not be fixed and so was removed")

     

       412
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])

     

       413
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])

     

       414
        
           (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

···

       408
        
         };

     

       409
        
         imports = [

     

       410
        
           (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]

     

       411
       +
              "Socket activation never worked correctly and could at this time not be fixed and so was removed")

     

       412
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])

     

       413
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])

     

       414
        
           (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

+9 -9

nixos/modules/services/misc/siproxd.nix

···

       39
        
               default = false;

     

       40
        
               description = ''

     

       41
        
                 Whether to enable the Siproxd SIP

     

       42
       -
       	  proxy/masquerading daemon.

     

       43
        
               '';

     

       44
        
             };

     

       45
        
       

     
···

       57
        
       

     

       58
        
             hostsAllowReg = mkOption {

     

       59
        
               type = types.listOf types.str;

     

       60
       -
       	default = [ ];

     

       61
        
               example = [ "192.168.1.0/24" "192.168.2.0/24" ];

     

       62
       -
       	description = ''

     

       63
        
                 Acess control list for incoming SIP registrations.

     

       64
        
               '';

     

       65
        
             };

     

       66
        
       

     

       67
        
             hostsAllowSip = mkOption {

     

       68
        
               type = types.listOf types.str;

     

       69
       -
       	default = [ ];

     

       70
        
               example = [ "123.45.0.0/16" "123.46.0.0/16" ];

     

       71
       -
       	description = ''

     

       72
        
                 Acess control list for incoming SIP traffic.

     

       73
        
               '';

     

       74
        
             };

     

       75
        
       

     

       76
        
             hostsDenySip = mkOption {

     

       77
        
               type = types.listOf types.str;

     

       78
       -
       	default = [ ];

     

       79
        
               example = [ "10.0.0.0/8" "11.0.0.0/8" ];

     

       80
       -
       	description = ''

     

       81
        
                 Acess control list for denying incoming

     

       82
       -
       	   SIP registrations and traffic.

     

       83
        
               '';

     

       84
        
             };

     

       85
        
       

     
···

       87
        
               type = types.int;

     

       88
        
               default = 5060;

     

       89
        
               description = ''

     

       90
       -
       	  Port to listen for incoming SIP messages.

     

       91
        
               '';

     

       92
        
             };

     

       93

···

       39
        
               default = false;

     

       40
        
               description = ''

     

       41
        
                 Whether to enable the Siproxd SIP

     

       42
       +
                 proxy/masquerading daemon.

     

       43
        
               '';

     

       44
        
             };

     

       45
        
       

     
···

       57
        
       

     

       58
        
             hostsAllowReg = mkOption {

     

       59
        
               type = types.listOf types.str;

     

       60
       +
               default = [ ];

     

       61
        
               example = [ "192.168.1.0/24" "192.168.2.0/24" ];

     

       62
       +
               description = ''

     

       63
        
                 Acess control list for incoming SIP registrations.

     

       64
        
               '';

     

       65
        
             };

     

       66
        
       

     

       67
        
             hostsAllowSip = mkOption {

     

       68
        
               type = types.listOf types.str;

     

       69
       +
               default = [ ];

     

       70
        
               example = [ "123.45.0.0/16" "123.46.0.0/16" ];

     

       71
       +
               description = ''

     

       72
        
                 Acess control list for incoming SIP traffic.

     

       73
        
               '';

     

       74
        
             };

     

       75
        
       

     

       76
        
             hostsDenySip = mkOption {

     

       77
        
               type = types.listOf types.str;

     

       78
       +
               default = [ ];

     

       79
        
               example = [ "10.0.0.0/8" "11.0.0.0/8" ];

     

       80
       +
               description = ''

     

       81
        
                 Acess control list for denying incoming

     

       82
       +
                 SIP registrations and traffic.

     

       83
        
               '';

     

       84
        
             };

     

       85
        
       

     
···

       87
        
               type = types.int;

     

       88
        
               default = 5060;

     

       89
        
               description = ''

     

       90
       +
                 Port to listen for incoming SIP messages.

     

       91
        
               '';

     

       92
        
             };

     

       93

+1 -1

nixos/modules/services/misc/svnserve.nix

···

       25
        
       

     

       26
        
             svnBaseDir = mkOption {

     

       27
        
               default = "/repos";

     

       28
       -
       	description = "Base directory from which Subversion repositories are accessed.";

     

       29
        
             };

     

       30
        
           };

     

       31

···

       25
        
       

     

       26
        
             svnBaseDir = mkOption {

     

       27
        
               default = "/repos";

     

       28
       +
               description = "Base directory from which Subversion repositories are accessed.";

     

       29
        
             };

     

       30
        
           };

     

       31

+6 -6

nixos/modules/services/network-filesystems/netatalk.nix

···

       108
        
       

     

       109
        
             extmap = mkOption {

     

       110
        
               type = types.lines;

     

       111
       -
       	default = "";

     

       112
       -
       	description = ''

     

       113
       -
       	  File name extension mappings.

     

       114
       -
       	  See <literal>man extmap.conf</literal> for more information.

     

       115
        
               '';

     

       116
        
             };

     

       117
        
       

     
···

       132
        
               Type = "forking";

     

       133
        
               GuessMainPID = "no";

     

       134
        
               PIDFile = "/run/lock/netatalk";

     

       135
       -
       	ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";

     

       136
        
               ExecStart  = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";

     

       137
        
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP  $MAINPID";

     

       138
       -
       	ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";

     

       139
        
               Restart = "always";

     

       140
        
               RestartSec = 1;

     

       141
        
             };

···

       108
        
       

     

       109
        
             extmap = mkOption {

     

       110
        
               type = types.lines;

     

       111
       +
               default = "";

     

       112
       +
               description = ''

     

       113
       +
                 File name extension mappings.

     

       114
       +
                 See <literal>man extmap.conf</literal> for more information.

     

       115
        
               '';

     

       116
        
             };

     

       117
        
       

     
···

       132
        
               Type = "forking";

     

       133
        
               GuessMainPID = "no";

     

       134
        
               PIDFile = "/run/lock/netatalk";

     

       135
       +
               ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";

     

       136
        
               ExecStart  = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";

     

       137
        
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP  $MAINPID";

     

       138
       +
               ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";

     

       139
        
               Restart = "always";

     

       140
        
               RestartSec = 1;

     

       141
        
             };

+9 -7

nixos/modules/services/networking/morty.nix

···

       29
        
             key = mkOption {

     

       30
        
               type = types.str;

     

       31
        
               default = "";

     

       32
       -
               description = "HMAC url validation key (hexadecimal encoded).

     

       33
       -
       	Leave blank to disable. Without validation key, anyone can

     

       34
       -
       	submit proxy requests. Leave blank to disable.";

     

       0
        
       
     

       0
        
       
     

       35
        
               defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";

     

       36
        
             };

     

       37
        
       

     
···

       85
        
               serviceConfig = {

     

       86
        
                 User = "morty";

     

       87
        
                 ExecStart = ''${cfg.package}/bin/morty              \

     

       88
       -
       	    -listen ${cfg.listenAddress}:${toString cfg.port} \

     

       89
       -
       	    ${optionalString cfg.ipv6 "-ipv6"}                \

     

       90
       -
       	    ${optionalString (cfg.key != "") "-key " + cfg.key} \

     

       91
       -
       	  '';

     

       92
        
               };

     

       93
        
             };

     

       94
        
           environment.systemPackages = [ cfg.package ];

···

       29
        
             key = mkOption {

     

       30
        
               type = types.str;

     

       31
        
               default = "";

     

       32
       +
               description = ''

     

       33
       +
                 HMAC url validation key (hexadecimal encoded).

     

       34
       +
                 Leave blank to disable. Without validation key, anyone can

     

       35
       +
                 submit proxy requests. Leave blank to disable.

     

       36
       +
               '';

     

       37
        
               defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";

     

       38
        
             };

     

       39
        
       

     
···

       87
        
               serviceConfig = {

     

       88
        
                 User = "morty";

     

       89
        
                 ExecStart = ''${cfg.package}/bin/morty              \

     

       90
       +
                   -listen ${cfg.listenAddress}:${toString cfg.port} \

     

       91
       +
                   ${optionalString cfg.ipv6 "-ipv6"}                \

     

       92
       +
                   ${optionalString (cfg.key != "") "-key " + cfg.key} \

     

       93
       +
                 '';

     

       94
        
               };

     

       95
        
             };

     

       96
        
           environment.systemPackages = [ cfg.package ];

+9 -9

nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix

···

       1173
        
       

     

       1174
        
           ppk = mkPrefixedAttrsOfParams {

     

       1175
        
             secret = mkOptionalStrParam ''

     

       1176
       -
       	      Value of the PPK. It may either be an ASCII string, a hex encoded string

     

       1177
       -
       	      if it has a <literal>0x</literal> prefix or a Base64 encoded string if

     

       1178
       -
       	      it has a <literal>0s</literal> prefix in its value. Should have at least

     

       1179
       -
       	      256 bits of entropy for 128-bit security.

     

       1180
        
             '';

     

       1181
        
       

     

       1182
        
             id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''

     

       1183
       -
       	      PPK identity the PPK belongs to. Multiple unique identities may be

     

       1184
       -
       	      specified, each having an <literal>id</literal> prefix, if a secret is

     

       1185
       -
       	      shared between multiple peers.

     

       1186
        
             '';

     

       1187
        
           } ''

     

       1188
       -
       	    Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is

     

       1189
       -
       	    defined in a unique section having the <literal>ppk</literal> prefix.

     

       1190
        
           '';

     

       1191
        
       

     

       1192
        
           private = mkPrefixedAttrsOfParams {

···

       1173
        
       

     

       1174
        
           ppk = mkPrefixedAttrsOfParams {

     

       1175
        
             secret = mkOptionalStrParam ''

     

       1176
       +
               Value of the PPK. It may either be an ASCII string, a hex encoded string

     

       1177
       +
               if it has a <literal>0x</literal> prefix or a Base64 encoded string if

     

       1178
       +
               it has a <literal>0s</literal> prefix in its value. Should have at least

     

       1179
       +
               256 bits of entropy for 128-bit security.

     

       1180
        
             '';

     

       1181
        
       

     

       1182
        
             id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''

     

       1183
       +
               PPK identity the PPK belongs to. Multiple unique identities may be

     

       1184
       +
               specified, each having an <literal>id</literal> prefix, if a secret is

     

       1185
       +
               shared between multiple peers.

     

       1186
        
             '';

     

       1187
        
           } ''

     

       1188
       +
             Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is

     

       1189
       +
             defined in a unique section having the <literal>ppk</literal> prefix.

     

       1190
        
           '';

     

       1191
        
       

     

       1192
        
           private = mkPrefixedAttrsOfParams {

+1 -1

nixos/modules/services/networking/wasabibackend.nix

···

       21
        
             RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";

     

       22
        
         };

     

       23
        
       

     

       24
       -
       	configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);

     

       25
        
       

     

       26
        
       in {

     

       27

···

       21
        
             RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);

     

       25
        
       

     

       26
        
       in {

     

       27

+2 -2

nixos/modules/services/security/oauth2_proxy.nix

···

       448
        
             default = false;

     

       449
        
             description = ''

     

       450
        
               In case when running behind a reverse proxy, controls whether headers

     

       451
       -
       	like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse

     

       452
        
               proxy will require this flag to be set to avoid logging the reverse

     

       453
        
               proxy IP address.

     

       454
        
             '';

     
···

       524
        
             type = types.nullOr types.str;

     

       525
        
             default = null;

     

       526
        
             description = ''

     

       527
       -
             	Profile access endpoint.

     

       528
        
             '';

     

       529
        
           };

     

       530

···

       448
        
             default = false;

     

       449
        
             description = ''

     

       450
        
               In case when running behind a reverse proxy, controls whether headers

     

       451
       +
               like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse

     

       452
        
               proxy will require this flag to be set to avoid logging the reverse

     

       453
        
               proxy IP address.

     

       454
        
             '';

     
···

       524
        
             type = types.nullOr types.str;

     

       525
        
             default = null;

     

       526
        
             description = ''

     

       527
       +
               Profile access endpoint.

     

       528
        
             '';

     

       529
        
           };

     

       530

+2 -2

nixos/modules/services/x11/window-managers/evilwm.nix

···

       16
        
           services.xserver.windowManager.session = singleton {

     

       17
        
             name = "evilwm";

     

       18
        
             start = ''

     

       19
       -
       	${pkgs.evilwm}/bin/evilwm &

     

       20
       -
       	waitPID=$!

     

       21
        
             '';

     

       22
        
           };

     

       23
        
           environment.systemPackages = [ pkgs.evilwm ];

···

       16
        
           services.xserver.windowManager.session = singleton {

     

       17
        
             name = "evilwm";

     

       18
        
             start = ''

     

       19
       +
               ${pkgs.evilwm}/bin/evilwm &

     

       20
       +
               waitPID=$!

     

       21
        
             '';

     

       22
        
           };

     

       23
        
           environment.systemPackages = [ pkgs.evilwm ];

+11 -11

nixos/modules/virtualisation/nixos-containers.nix

···

       614
        
                     '';

     

       615
        
                   };

     

       616
        
       

     

       617
       -
       		    timeoutStartSec = mkOption {

     

       618
       -
       		      type = types.str;

     

       619
       -
       		      default = "1min";

     

       620
       -
       		      description = ''

     

       621
       -
       		        Time for the container to start. In case of a timeout,

     

       622
       -
       		        the container processes get killed.

     

       623
       -
       		        See <citerefentry><refentrytitle>systemd.time</refentrytitle>

     

       624
       -
       		        <manvolnum>7</manvolnum></citerefentry>

     

       625
       -
       		        for more information about the format.

     

       626
       -
       		       '';

     

       627
       -
       		    };

     

       628
        
       

     

       629
        
                   bindMounts = mkOption {

     

       630
        
                     type = with types; attrsOf (submodule bindMountOpts);

···

       614
        
                     '';

     

       615
        
                   };

     

       616
        
       

     

       617
       +
                   timeoutStartSec = mkOption {

     

       618
       +
                     type = types.str;

     

       619
       +
                     default = "1min";

     

       620
       +
                     description = ''

     

       621
       +
                       Time for the container to start. In case of a timeout,

     

       622
       +
                       the container processes get killed.

     

       623
       +
                       See <citerefentry><refentrytitle>systemd.time</refentrytitle>

     

       624
       +
                       <manvolnum>7</manvolnum></citerefentry>

     

       625
       +
                       for more information about the format.

     

       626
       +
                      '';

     

       627
       +
                   };

     

       628
        
       

     

       629
        
                   bindMounts = mkOption {

     

       630
        
                     type = with types; attrsOf (submodule bindMountOpts);

+3 -3

nixos/tests/morty.nix

···

       12
        
             { ... }:

     

       13
        
             { services.morty = {

     

       14
        
               enable = true;

     

       15
       -
       	key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";

     

       16
       -
       	port = 3001;

     

       17
       -
       	};

     

       18
        
             };

     

       19
        
       

     

       20
        
           };

···

       12
        
             { ... }:

     

       13
        
             { services.morty = {

     

       14
        
               enable = true;

     

       15
       +
               key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";

     

       16
       +
               port = 3001;

     

       17
       +
               };

     

       18
        
             };

     

       19
        
       

     

       20
        
           };

+1 -1

nixos/tests/quorum.nix

···

       55
        
               parentHash =

     

       56
        
                 "0x0000000000000000000000000000000000000000000000000000000000000000";

     

       57
        
               timestamp = "0x5cffc201";

     

       58
       -
       		  };

     

       59
        
            };

     

       60
        
           };

     

       61
        
         };

···

       55
        
               parentHash =

     

       56
        
                 "0x0000000000000000000000000000000000000000000000000000000000000000";

     

       57
        
               timestamp = "0x5cffc201";

     

       58
       +
             };

     

       59
        
            };

     

       60
        
           };

     

       61
        
         };

+1 -1

nixos/tests/rspamd.nix

···

       209
        
                     return false

     

       210
        
                   end,

     

       211
        
                   score = 5.0,

     

       212
       -
       	          description = 'Allow no cows',

     

       213
        
                   group = "cows",

     

       214
        
                 }

     

       215
        
                 rspamd_logger.infox(rspamd_config, 'Work dammit!!!')

···

       209
        
                     return false

     

       210
        
                   end,

     

       211
        
                   score = 5.0,

     

       212
       +
                   description = 'Allow no cows',

     

       213
        
                   group = "cows",

     

       214
        
                 }

     

       215
        
                 rspamd_logger.infox(rspamd_config, 'Work dammit!!!')