Unverified Commit bff70f31 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents e01e9566 8d2d1c86
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -195,8 +195,6 @@
  of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
  make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.

- `pkgs.nextcloud30` has been removed since it's out of support upstream.

- `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.

- `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.
@@ -332,7 +330,3 @@
  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).

- `cloudflare-ddns`: Added package cloudflare-ddns.

- `nextcloud32`: Added for the Nextcloud 32 major release.

  See https://nextcloud.com/blog/nextcloud-hub25-autumn/ for more details on the new major version.
+6 −0
Original line number Diff line number Diff line
@@ -2482,6 +2482,12 @@
    githubId = 574938;
    name = "Jonathan Glines";
  };
  auscyber = {
    email = "ivyp@outlook.com.au";
    github = "auscyber";
    name = "Ivy Pierlot";
    githubId = 12080502;
  };
  austin-artificial = {
    email = "austin.platt@artificial.io";
    github = "austin-artificial";
+9 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@

- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.

- Direct use of `pkgs.formats.systemd` has been deprecated, and should now be instantiated with `pkgs.formats.systemd { }` similarly to other items in `pkgs.formats`.

- The Postfix module has been updated and likely requires configuration changes:
  - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure
    - [services.postfix.settings.main.smtpd_tls_chain_files](#opt-services.postfix.settings.main.smtpd_tls_chain_files) for server certificates,
@@ -304,6 +306,13 @@

- `services.clamsmtp` is unmaintained and was removed from Nixpkgs.

- The latest available version of Nextcloud is v32 (available as `pkgs.nextcloud32`). The installation logic is as follows:
  - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
  - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.05, `pkgs.nextcloud32` will be installed by default.
  - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.11, `pkgs.nextcloud31` will be installed by default.
  - `nextcloud30` is EOL and was thus removed.
  - Please note that an upgrade from v30 (or older) to v32 directly is not possible. Please upgrade to `nextcloud31` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud30;`](#opt-services.nextcloud.package).

- `services.eris-server` was removed from Nixpkgs due to a hostile upstream.

- `prosody` gained a config check option named `services.prosody.checkConfig` which runs `prosodyctl check config` and is turned on by default.
+20 −18
Original line number Diff line number Diff line
@@ -159,8 +159,7 @@ in
      "::1" = [ cfgN.hostName ];
    };

    services = lib.mkMerge [
      {
    services = {
      nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
        proxyPass = "http://unix:${cfg.socketPath}";
        proxyWebsockets = true;
@@ -172,14 +171,17 @@ in
            proxy_buffering off;
          '';
      };
      }

      (lib.mkIf cfg.bendDomainToLocalhost {
        nextcloud.settings.trusted_proxies = [
      nextcloud = {
        extraApps = {
          inherit (config.services.nextcloud.package.packages.apps)
            notify_push
            ;
        };
        settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
          "127.0.0.1"
          "::1"
        ];
      })
    ];
      };
    };
  };
}
+1 −52
Original line number Diff line number Diff line
@@ -232,58 +232,7 @@ By default, `nginx` is used as reverse-proxy for `nextcloud`.
However, it's possible to use e.g. `httpd` by explicitly disabling
`nginx` using [](#opt-services.nginx.enable) and fixing the
settings `listen.owner` & `listen.group` in the
[corresponding `phpfpm` pool](#opt-services.phpfpm.pools).

An exemplary configuration may look like this:
```nix
{
  config,
  lib,
  pkgs,
  ...
}:
{
  services.nginx.enable = false;
  services.nextcloud = {
    enable = true;
    hostName = "localhost";

    # further, required options
  };
  services.phpfpm.pools.nextcloud.settings = {
    "listen.owner" = config.services.httpd.user;
    "listen.group" = config.services.httpd.group;
  };
  services.httpd = {
    enable = true;
    adminAddr = "webmaster@localhost";
    extraModules = [ "proxy_fcgi" ];
    virtualHosts."localhost" = {
      documentRoot = config.services.nextcloud.package;
      extraConfig = ''
        <Directory "${config.services.nextcloud.package}">
          <FilesMatch "\.php$">
            <If "-f %{REQUEST_FILENAME}">
              SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/"
            </If>
          </FilesMatch>
          <IfModule mod_rewrite.c>
            RewriteEngine On
            RewriteBase /
            RewriteRule ^index\.php$ - [L]
            RewriteCond %{REQUEST_FILENAME} !-f
            RewriteCond %{REQUEST_FILENAME} !-d
            RewriteRule . /index.php [L]
          </IfModule>
          DirectoryIndex index.php
          Require all granted
          Options +FollowSymLinks
        </Directory>
      '';
    };
  };
}
```
[`phpfpm` pool `nextcloud`](#opt-services.phpfpm.pools).

## Installing Apps and PHP extensions {#installing-apps-php-extensions-nextcloud}

Loading