commit fd92a488b2a3f0a5ac2a821db9e57d06f24a569d · pyrox.dev/nixpkgs

+9

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

···

       115
       115
        
       

     

       116
       116
        
       - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI

     

       117
       117
        
       

     

       118
       118
       +
       - [](#opt-services.nextcloud.config.dbtype) is unset by default, the previous default was `sqlite`.

     

       119
       119
       +
         This was done because `sqlite` is not a reasonable default since it's

     

       120
       120
       +
         [not recommended by upstream](https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html)

     

       121
       121
       +
         and thus doesn't qualify as default.

     

       122
       122
       +
       

     

       123
       123
       +
       - Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised

     

       124
       124
       +
         to review the new defaults and description of

     

       125
       125
       +
         [](#opt-services.nextcloud.poolSettings).

     

       126
       126
       +
       

     

       118
       127
        
       - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:

     

       119
       128
        
         ```diff

     

       120
       129
        
         -services.asusd.asusdConfig = '''file contents'''

+9 -6

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

···

       374
       374
        
             type = with types; attrsOf (oneOf [ str int bool ]);

     

       375
       375
        
             default = {

     

       376
       376
        
               "pm" = "dynamic";

     

       377
       377
       -
               "pm.max_children" = "32";

     

       378
       378
       -
               "pm.start_servers" = "2";

     

       379
       379
       -
               "pm.min_spare_servers" = "2";

     

       380
       380
       -
               "pm.max_spare_servers" = "4";

     

       377
       377
       +
               "pm.max_children" = "120";

     

       378
       378
       +
               "pm.start_servers" = "12";

     

       379
       379
       +
               "pm.min_spare_servers" = "6";

     

       380
       380
       +
               "pm.max_spare_servers" = "18";

     

       381
       381
        
               "pm.max_requests" = "500";

     

       382
       382
        
             };

     

       383
       383
        
             description = ''

     

       384
       384
       -
               Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives.

     

       384
       384
       +
               Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on

     

       385
       385
       +
               configuration directives. The above are recommended for a server with 4GiB of RAM.

     

       386
       386
       +
       

     

       387
       387
       +
               It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm)

     

       388
       388
       +
               and consider customizing the values.

     

       385
       389
        
             '';

     

       386
       390
        
           };

     

       387
       391
        
       

     
···

       416
       420
        
           config = {

     

       417
       421
        
             dbtype = mkOption {

     

       418
       422
        
               type = types.enum [ "sqlite" "pgsql" "mysql" ];

     

       419
       419
       -
               default = "sqlite";

     

       420
       423
        
               description = "Database type.";

     

       421
       424
        
             };

     

       422
       425
        
             dbname = mkOption {

+1

nixos/tests/nextcloud/basic.nix

···

       59
       59
        
       

     

       60
       60
        
                 services.nextcloud = {

     

       61
       61
        
                   enable = true;

     

       62
       62
       +
                   config.dbtype = "sqlite";

     

       62
       63
        
                   datadir = "/var/lib/nextcloud-data";

     

       63
       64
        
                   autoUpdateApps = {

     

       64
       65
        
                     enable = true;

+1 -2

nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix

···

       69
       69
        
       

     

       70
       70
        
                 services.postgresql = {

     

       71
       71
        
                   enable = true;

     

       72
       72
       -
                   package = pkgs.postgresql_14;

     

       73
       72
        
                 };

     

       74
       73
        
                 systemd.services.postgresql.postStart = pkgs.lib.mkAfter ''

     

       75
       74
        
                   password=$(cat ${config.services.nextcloud.config.dbpassFile})

     

       76
       75
        
                   ${config.services.postgresql.package}/bin/psql <<EOF

     

       77
       76
        
                     CREATE ROLE ${adminuser} WITH LOGIN PASSWORD '$password' CREATEDB;

     

       78
       77
        
                     CREATE DATABASE nextcloud;

     

       79
       79
       -
                     GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${adminuser};

     

       78
       78
       +
                     ALTER DATABASE nextcloud OWNER to ${adminuser};

     

       80
       79
        
                   EOF

     

       81
       80
        
                 '';

     

       82
       81

+2

nixos/tests/nextcloud/with-objectstore.nix

···

       36
       36
        
                 networking.firewall.allowedTCPPorts = [ 9000 ];

     

       37
       37
        
                 environment.systemPackages = [ pkgs.minio-client ];

     

       38
       38
        
       

     

       39
       39
       +
                 services.nextcloud.config.dbtype = "sqlite";

     

       40
       40
       +
       

     

       39
       41
        
                 services.nextcloud.config.objectstore.s3 = {

     

       40
       42
        
                   enable = true;

     

       41
       43
        
                   bucket = "nextcloud";