commit c3d4998e416fd2704066d87461151bd2235471a8 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2003.xml

···

       266
       266
        
          </listitem>

     

       267
       267
        
          <listitem>

     

       268
       268
        
           <para>

     

       269
       269
       +
            The <literal>kresd</literal> services deprecates the <literal>interfaces</literal> option

     

       270
       270
       +
            in favor of the <literal>listenPlain</literal> option which requires full

     

       271
       271
       +
            <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream=">systemd.socket compatible</link>

     

       272
       272
       +
            declaration which always include a port.

     

       273
       273
       +
           </para>

     

       274
       274
       +
          </listitem>

     

       275
       275
       +
          <listitem>

     

       276
       276
       +
           <para>

     

       269
       277
        
            Virtual console options have been reorganized and can be found under

     

       270
       278
        
            a single top-level attribute: <literal>console</literal>.

     

       271
       279
        
            The full set of changes is as follows:

+17 -8

nixos/modules/services/networking/kresd.nix

···

       13
       13
        
       {

     

       14
       14
        
         meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];

     

       15
       15
        
       

     

       16
       16
       +
         imports = [

     

       17
       17
       +
           (mkChangedOptionModule [ "services" "kresd" "interfaces" ] [ "services" "kresd" "listenPlain" ]

     

       18
       18
       +
             (config:

     

       19
       19
       +
               let value = getAttrFromPath [ "services" "kresd" "interfaces" ] config;

     

       20
       20
       +
               in map

     

       21
       21
       +
                 (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") # Syntax depends on being IPv6 or IPv4.

     

       22
       22
       +
                 value

     

       23
       23
       +
             )

     

       24
       24
       +
           )

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       16
       27
        
         ###### interface

     

       17
       28
        
         options.services.kresd = {

     

       18
       29
        
           enable = mkOption {

     
···

       39
       50
        
               Directory for caches.  They are intended to survive reboots.

     

       40
       51
        
             '';

     

       41
       52
        
           };

     

       42
       42
       -
           interfaces = mkOption {

     

       53
       53
       +
           listenPlain = mkOption {

     

       43
       54
        
             type = with types; listOf str;

     

       44
       44
       -
             default = [ "::1" "127.0.0.1" ];

     

       55
       55
       +
             default = [ "[::1]:53" "127.0.0.1:53" ];

     

       45
       56
        
             description = ''

     

       46
       46
       -
               What addresses the server should listen on. (UDP+TCP 53)

     

       57
       57
       +
               What addresses and ports the server should listen on.

     

       58
       58
       +
               For detailed syntax see ListenStream in man systemd.socket.

     

       47
       59
        
             '';

     

       48
       60
        
           };

     

       49
       61
        
           listenTLS = mkOption {

     
···

       51
       63
        
             default = [];

     

       52
       64
        
             example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];

     

       53
       65
        
             description = ''

     

       54
       54
       -
               Addresses on which kresd should provide DNS over TLS (see RFC 7858).

     

       66
       66
       +
               Addresses and ports on which kresd should provide DNS over TLS (see RFC 7858).

     

       55
       67
        
               For detailed syntax see ListenStream in man systemd.socket.

     

       56
       68
        
             '';

     

       57
       69
        
           };

     
···

       76
       88
        
           systemd.sockets.kresd = rec {

     

       77
       89
        
             wantedBy = [ "sockets.target" ];

     

       78
       90
        
             before = wantedBy;

     

       79
       79
       -
             listenStreams = map

     

       80
       80
       -
               # Syntax depends on being IPv6 or IPv4.

     

       81
       81
       -
               (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")

     

       82
       82
       -
               cfg.interfaces;

     

       91
       91
       +
             listenStreams = cfg.listenPlain;

     

       83
       92
        
             socketConfig = {

     

       84
       93
        
               ListenDatagram = listenStreams;

     

       85
       94
        
               FreeBind = true;