commit 8e14bf10c2a60f57b1bb10c74111fb8ecf811ba2 · pyrox.dev/nixpkgs

+17

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

···

       146
       146
        
             </listitem>

     

       147
       147
        
             <listitem>

     

       148
       148
        
               <para>

     

       149
       149
       +
                 In <literal>mastodon</literal> it is now necessary to specify

     

       150
       150
       +
                 location of file with <literal>PostgreSQL</literal> database

     

       151
       151
       +
                 password. In

     

       152
       152
       +
                 <literal>services.mastodon.database.passwordFile</literal>

     

       153
       153
       +
                 parameter default value

     

       154
       154
       +
                 <literal>/var/lib/mastodon/secrets/db-password</literal> has

     

       155
       155
       +
                 been changed to <literal>null</literal>.

     

       156
       156
       +
               </para>

     

       157
       157
       +
             </listitem>

     

       158
       158
       +
             <listitem>

     

       159
       159
       +
               <para>

     

       149
       160
        
                 The <literal>nix.readOnlyStore</literal> option has been

     

       150
       161
        
                 renamed to <literal>boot.readOnlyNixStore</literal> to clarify

     

       151
       162
        
                 that it configures the NixOS boot process, not the Nix daemon.

     
···

       206
       217
        
               <para>

     

       207
       218
        
                 The minimal ISO image now uses the

     

       208
       219
        
                 <literal>nixos/modules/profiles/minimal.nix</literal> profile.

     

       220
       220
       +
               </para>

     

       221
       221
       +
             </listitem>

     

       222
       222
       +
             <listitem>

     

       223
       223
       +
               <para>

     

       224
       224
       +
                 <literal>mastodon</literal> now supports connection to a

     

       225
       225
       +
                 remote <literal>PostgreSQL</literal> database.

     

       209
       226
        
               </para>

     

       210
       227
        
             </listitem>

     

       211
       228
        
             <listitem>

nixos/doc/manual/release-notes/rl-2305.section.md

···

       43
       43
        
       

     

       44
       44
        
       - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.

     

       45
       45
        
       

     

       46
       46
       +
       - In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`.

     

       47
       47
       +
       

     

       46
       48
        
       - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon.

     

       47
       49
        
       

     

       48
       50
        
       ## Other Notable Changes {#sec-release-23.05-notable-changes}

     
···

       63
       65
        
       - To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services.

     

       64
       66
        
       

     

       65
       67
        
       - The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.

     

       68
       68
       +
       

     

       69
       69
       +
       - `mastodon` now supports connection to a remote `PostgreSQL` database.

     

       66
       70
        
       

     

       67
       71
        
       - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).

     

       68
       72

+33 -17

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

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       1
       1
       +
       { lib, pkgs, config, options, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.mastodon;

     

       5
       5
       +
         opt = options.services.mastodon;

     

       6
       6
       +
       

     

       5
       7
        
         # We only want to create a database if we're actually going to connect to it.

     

       6
       8
        
         databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "/run/postgresql";

     

       7
       9
        
       

     
···

       23
       25
        
           REDIS_HOST = cfg.redis.host;

     

       24
       26
        
           REDIS_PORT = toString(cfg.redis.port);

     

       25
       27
        
           DB_HOST = cfg.database.host;

     

       26
       26
       -
           DB_PORT = toString(cfg.database.port);

     

       27
       28
        
           DB_NAME = cfg.database.name;

     

       28
       29
        
           LOCAL_DOMAIN = cfg.localDomain;

     

       29
       30
        
           SMTP_SERVER = cfg.smtp.host;

     
···

       37
       38
        
       

     

       38
       39
        
           TRUSTED_PROXY_IP = cfg.trustedProxy;

     

       39
       40
        
         }

     

       40
       40
       -
         // (if cfg.smtp.authenticate then { SMTP_LOGIN  = cfg.smtp.user; } else {})

     

       41
       41
       +
         // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; }

     

       42
       42
       +
         // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN  = cfg.smtp.user; }

     

       41
       43
        
         // cfg.extraConfig;

     

       42
       44
        
       

     

       43
       45
        
         systemCallsList = [ "@cpu-emulation" "@debug" "@keyring" "@ipc" "@mount" "@obsolete" "@privileged" "@setuid" ];

     
···

       314
       316
        
               };

     

       315
       317
        
       

     

       316
       318
        
               port = lib.mkOption {

     

       317
       317
       -
                 type = lib.types.port;

     

       318
       318
       -
                 default = 5432;

     

       319
       319
       +
                 type = lib.types.nullOr lib.types.port;

     

       320
       320
       +
                 default = if cfg.database.createLocally then null else 5432;

     

       321
       321
       +
                 defaultText = lib.literalExpression ''

     

       322
       322
       +
                   if config.${opt.database.createLocally}

     

       323
       323
       +
                   then null

     

       324
       324
       +
                   else 5432

     

       325
       325
       +
                 '';

     

       319
       326
        
                 description = lib.mdDoc "Database host port.";

     

       320
       327
        
               };

     

       321
       328
        
       

     
···

       333
       340
        
       

     

       334
       341
        
               passwordFile = lib.mkOption {

     

       335
       342
        
                 type = lib.types.nullOr lib.types.path;

     

       336
       336
       -
                 default = "/var/lib/mastodon/secrets/db-password";

     

       337
       337
       -
                 example = "/run/keys/mastodon-db-password";

     

       343
       343
       +
                 default = null;

     

       344
       344
       +
                 example = "/var/lib/mastodon/secrets/db-password";

     

       338
       345
        
                 description = lib.mdDoc ''

     

       339
       346
        
                   A file containing the password corresponding to

     

       340
       347
        
                   {option}`database.user`.

     
···

       468
       475
        
           assertions = [

     

       469
       476
        
             {

     

       470
       477
        
               assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user);

     

       471
       471
       -
               message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.'';

     

       478
       478
       +
               message = ''

     

       479
       479
       +
                 For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer

     

       480
       480
       +
                   authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user

     

       481
       481
       +
                   and services.mastodon.database.user must be identical.

     

       482
       482
       +
               '';

     

       483
       483
       +
             }

     

       484
       484
       +
             {

     

       485
       485
       +
               assertion = !databaseActuallyCreateLocally -> (cfg.database.host != "/run/postgresql");

     

       486
       486
       +
               message = ''

     

       487
       487
       +
                 <option>services.mastodon.database.host</option> needs to be set if

     

       488
       488
       +
                   <option>services.mastodon.database.createLocally</option> is not enabled.

     

       489
       489
       +
               '';

     

       472
       490
        
             }

     

       473
       491
        
             {

     

       474
       492
        
               assertion = cfg.smtp.authenticate -> (cfg.smtp.user != null);

     
···

       512
       530
        
               OTP_SECRET="$(cat ${cfg.otpSecretFile})"

     

       513
       531
        
               VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})"

     

       514
       532
        
               VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})"

     

       533
       533
       +
             '' + lib.optionalString (cfg.database.passwordFile != null) ''

     

       515
       534
        
               DB_PASS="$(cat ${cfg.database.passwordFile})"

     

       516
       516
       -
             '' + (if cfg.smtp.authenticate then ''

     

       535
       535
       +
             '' + lib.optionalString cfg.smtp.authenticate ''

     

       517
       536
        
               SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})"

     

       518
       518
       -
             '' else "") + ''

     

       537
       537
       +
             '' + ''

     

       519
       538
        
               EOF

     

       520
       539
        
             '';

     

       521
       540
        
             environment = env;

     
···

       555
       574
        
               unset PGPASSFILE

     

       556
       575
        
             '';

     

       557
       576
        
             path = [ cfg.package pkgs.postgresql ];

     

       558
       558
       -
             environment = env // (if (!databaseActuallyCreateLocally)

     

       559
       559
       -
               then {

     

       560
       560
       -
                 PGHOST = cfg.database.host;

     

       561
       561
       -
                 PGUSER = cfg.database.user;

     

       562
       562
       -
               }

     

       563
       563
       -
               else {}

     

       564
       564
       -
             );

     

       577
       577
       +
             environment = env // lib.optionalAttrs (!databaseActuallyCreateLocally) {

     

       578
       578
       +
               PGHOST = cfg.database.host;

     

       579
       579
       +
               PGUSER = cfg.database.user;

     

       580
       580
       +
             };

     

       565
       581
        
             serviceConfig = {

     

       566
       582
        
               Type = "oneshot";

     

       567
       583
        
               EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];