commit 0cfcb5908cc7164236f78cd21e02cc168dd028ac · pyrox.dev/nixpkgs

+5 -4

nixos/modules/misc/label.nix

···

       32
        
               Useful for not loosing track of configurations built from different

     

       33
        
               nixos branches/revisions, e.g.:

     

       34
        
       

     

       35
       -
               <screen>

     

       36
        
               #!/bin/sh

     

       37
        
               today=`date +%Y%m%d`

     

       38
        
               branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')`

     

       39
        
               revision=`(cd nixpkgs ; git rev-parse HEAD)`

     

       40
        
               export NIXOS_LABEL_VERSION="$today.$branch-''${revision:0:7}"

     

       41
       -
               nixos-rebuild switch</screen>

     

       0
        
       
     

       42
        
             '';

     

       43
        
           };

     

       44
        
       

     
···

       53
        
               Useful for not loosing track of configurations built with

     

       54
        
               different options, e.g.:

     

       55
        
       

     

       56
       -
               <screen>

     

       57
        
               {

     

       58
        
                 system.nixos.tags = [ "with-xen" ];

     

       59
        
                 virtualisation.xen.enable = true;

     

       60
        
               }

     

       61
       -
               </screen>

     

       62
        
             '';

     

       63
        
           };

     

       64

···

       32
        
               Useful for not loosing track of configurations built from different

     

       33
        
               nixos branches/revisions, e.g.:

     

       34
        
       

     

       35
       +
               <programlisting>

     

       36
        
               #!/bin/sh

     

       37
        
               today=`date +%Y%m%d`

     

       38
        
               branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')`

     

       39
        
               revision=`(cd nixpkgs ; git rev-parse HEAD)`

     

       40
        
               export NIXOS_LABEL_VERSION="$today.$branch-''${revision:0:7}"

     

       41
       +
               nixos-rebuild switch

     

       42
       +
               </programlisting>

     

       43
        
             '';

     

       44
        
           };

     

       45
        
       

     
···

       54
        
               Useful for not loosing track of configurations built with

     

       55
        
               different options, e.g.:

     

       56
        
       

     

       57
       +
               <programlisting>

     

       58
        
               {

     

       59
        
                 system.nixos.tags = [ "with-xen" ];

     

       60
        
                 virtualisation.xen.enable = true;

     

       61
        
               }

     

       62
       +
               </programlisting>

     

       63
        
             '';

     

       64
        
           };

     

       65

+3 -3

nixos/modules/services/development/zammad.nix

···

       160
        
                 Needs to be a 64 byte long string of hexadecimal

     

       161
        
                 characters. You can generate one by running

     

       162
        
       

     

       163
       -
                 <screen>

     

       164
       -
                 <prompt>$ </prompt>openssl rand -hex 64 >/path/to/secret_key_base_file

     

       165
       -
                 </screen>

     

       166
        
       

     

       167
        
                 This should be a string, not a nix path, since nix paths are

     

       168
        
                 copied into the world-readable nix store.

···

       160
        
                 Needs to be a 64 byte long string of hexadecimal

     

       161
        
                 characters. You can generate one by running

     

       162
        
       

     

       163
       +
                 <programlisting>

     

       164
       +
                 openssl rand -hex 64 >/path/to/secret_key_base_file

     

       165
       +
                 </programlisting>

     

       166
        
       

     

       167
        
                 This should be a string, not a nix path, since nix paths are

     

       168
        
                 copied into the world-readable nix store.

+26 -19

nixos/modules/services/networking/nsd.nix

···

       215
        
                         ];

     

       216
        
               description = ''

     

       217
        
                 Listed primary servers are allowed to notify this secondary server.

     

       218
       -
                 <screen><![CDATA[

     

       219
       -
                 Format: <ip> <key-name | NOKEY | BLOCKED>

     

       220
        
       

     

       221
       -
                 <ip> either a plain IPv4/IPv6 address or range. Valid patters for ranges:

     

       222
       -
                 * 10.0.0.0/24            # via subnet size

     

       223
       -
                 * 10.0.0.0&255.255.255.0 # via subnet mask

     

       224
       -
                 * 10.0.0.1-10.0.0.254    # via range

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       225
        
       

     

       226
        
                 A optional port number could be added with a '@':

     

       227
       -
                 * 2001:1234::1@1234

     

       0
        
       
     

       0
        
       
     

       228
        
       

     

       229
       -
                 <key-name | NOKEY | BLOCKED>

     

       230
       -
                 * <key-name> will use the specified TSIG key

     

       231
       -
                 * NOKEY      no TSIG signature is required

     

       232
       -
                 * BLOCKED    notifies from non-listed or blocked IPs will be ignored

     

       233
       -
                 * ]]></screen>

     

       0
        
       
     

       234
        
               '';

     

       235
        
             };

     

       236
        
       

     
···

       347
        
               description = ''

     

       348
        
                 This primary server will notify all given secondary servers about

     

       349
        
                 zone changes.

     

       350
       -
                 <screen><![CDATA[

     

       351
       -
                 Format: <ip> <key-name | NOKEY>

     

       352
        
       

     

       353
       -
                 <ip> a plain IPv4/IPv6 address with on optional port number (ip@port)

     

       354
        
       

     

       355
       -
                 <key-name | NOKEY>

     

       356
       -
                 * <key-name> sign notifies with the specified key

     

       357
       -
                 * NOKEY      don't sign notifies

     

       358
       -
                 ]]></screen>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       359
        
               '';

     

       360
        
             };

     

       361

···

       215
        
                         ];

     

       216
        
               description = ''

     

       217
        
                 Listed primary servers are allowed to notify this secondary server.

     

       218
       +
       

     

       219
       +
                 Format: <literal>&lt;ip&gt; &lt;key-name | NOKEY | BLOCKED&gt;</literal>

     

       220
        
       

     

       221
       +
                 <literal>&lt;ip&gt;</literal> either a plain IPv4/IPv6 address or range.

     

       222
       +
                 Valid patters for ranges:

     

       223
       +
                 <itemizedlist>

     

       224
       +
                   <listitem><para><literal>10.0.0.0/24</literal>: via subnet size</para></listitem>

     

       225
       +
                   <listitem><para><literal>10.0.0.0&amp;255.255.255.0</literal>: via subnet mask</para></listitem>

     

       226
       +
                   <listitem><para><literal>10.0.0.1-10.0.0.254</literal>: via range</para></listitem>

     

       227
       +
                 </itemizedlist>

     

       228
        
       

     

       229
        
                 A optional port number could be added with a '@':

     

       230
       +
                 <itemizedlist>

     

       231
       +
                   <listitem><para><literal>2001:1234::1@1234</literal></para></listitem>

     

       232
       +
                 </itemizedlist>

     

       233
        
       

     

       234
       +
                 <literal>&lt;key-name | NOKEY | BLOCKED&gt;</literal>

     

       235
       +
                 <itemizedlist>

     

       236
       +
                   <listitem><para><literal>&lt;key-name&gt;</literal> will use the specified TSIG key</para></listitem>

     

       237
       +
                   <listitem><para><literal>NOKEY</literal> no TSIG signature is required</para></listitem>

     

       238
       +
                   <listitem><para><literal>BLOCKED</literal>notifies from non-listed or blocked IPs will be ignored</para></listitem>

     

       239
       +
                 </itemizedlist>

     

       240
        
               '';

     

       241
        
             };

     

       242
        
       

     
···

       353
        
               description = ''

     

       354
        
                 This primary server will notify all given secondary servers about

     

       355
        
                 zone changes.

     

       0
        
       
     

       0
        
       
     

       356
        
       

     

       357
       +
                 Format: <literal>&lt;ip&gt; &lt;key-name | NOKEY&gt;</literal>

     

       358
        
       

     

       359
       +
                 <literal>&lt;ip&gt;</literal> a plain IPv4/IPv6 address with on optional port number (ip@port)

     

       360
       +
       

     

       361
       +
                 <literal>&lt;key-name | NOKEY&gt;</literal>

     

       362
       +
                 <itemizedlist>

     

       363
       +
                   <listitem><para><literal>&lt;key-name&gt;</literal> sign notifies with the specified key</para></listitem>

     

       364
       +
                   <listitem><para><literal>NOKEY</literal> don't sign notifies</para></listitem>

     

       365
       +
                 </itemizedlist>

     

       366
        
               '';

     

       367
        
             };

     

       368

+3 -3

nixos/modules/services/web-apps/discourse.nix

···

       68
        
                 Needs to be a 64 byte long string of hexadecimal

     

       69
        
                 characters. You can generate one by running

     

       70
        
       

     

       71
       -
                 <screen>

     

       72
       -
                 <prompt>$ </prompt>openssl rand -hex 64 >/path/to/secret_key_base_file

     

       73
       -
                 </screen>

     

       74
        
       

     

       75
        
                 This should be a string, not a nix path, since nix paths are

     

       76
        
                 copied into the world-readable nix store.

···

       68
        
                 Needs to be a 64 byte long string of hexadecimal

     

       69
        
                 characters. You can generate one by running

     

       70
        
       

     

       71
       +
                 <programlisting>

     

       72
       +
                 openssl rand -hex 64 >/path/to/secret_key_base_file

     

       73
       +
                 </programlisting>

     

       74
        
       

     

       75
        
                 This should be a string, not a nix path, since nix paths are

     

       76
        
                 copied into the world-readable nix store.

+3 -3

nixos/modules/system/activation/top-level.nix

···

       172
        
               To switch to a specialised configuration

     

       173
        
               (e.g. <literal>fewJobsManyCores</literal>) at runtime, run:

     

       174
        
       

     

       175
       -
               <screen>

     

       176
       -
               <prompt># </prompt>sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test

     

       177
       -
               </screen>

     

       178
        
             '';

     

       179
        
             type = types.attrsOf (types.submodule (

     

       180
        
               local@{ ... }: let

···

       172
        
               To switch to a specialised configuration

     

       173
        
               (e.g. <literal>fewJobsManyCores</literal>) at runtime, run:

     

       174
        
       

     

       175
       +
               <programlisting>

     

       176
       +
               sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test

     

       177
       +
               </programlisting>

     

       178
        
             '';

     

       179
        
             type = types.attrsOf (types.submodule (

     

       180
        
               local@{ ... }: let

+6 -5

nixos/modules/system/boot/initrd-ssh.nix

···

       51
        
               Specify SSH host keys to import into the initrd.

     

       52
        
       

     

       53
        
               To generate keys, use

     

       54
       -
               <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>:

     

       0
        
       
     

       55
        
       

     

       56
       -
               <screen>

     

       57
       -
               <prompt># </prompt>ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key

     

       58
       -
               <prompt># </prompt>ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key

     

       59
       -
               </screen>

     

       60
        
       

     

       61
        
               <warning>

     

       62
        
                 <para>

···

       51
        
               Specify SSH host keys to import into the initrd.

     

       52
        
       

     

       53
        
               To generate keys, use

     

       54
       +
               <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>

     

       55
       +
               as root:

     

       56
        
       

     

       57
       +
               <programlisting>

     

       58
       +
               ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key

     

       59
       +
               ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key

     

       60
       +
               </programlisting>

     

       61
        
       

     

       62
        
               <warning>

     

       63
        
                 <para>