3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Maximilian Bosch fddeb7cb73
Revert "nextcloud: use mkDefault for whole nginx config"
This breaks the Nextcloud vhost declaration when adding e.g. another
vhost as the `services.nginx.virtualHosts` option has `{ nextcloud =
...; }` as *default* value which will be replaced by another
`virtualHosts`-declaration with a higher (e.g. the default) priority.

The following cases are now supported & covered by the module:

* `nginx` is enabled with `nextcloud` enabled and other vhosts can be
  added / other options can be declared without having to care
  about the declaration's priority.

* Settings in the `nextcloud`-vhost in `nginx` have to be altered using
  `mkForce` as this is the only way how we officially support `nginx`
  for `nextcloud` and customizations have to be done explicitly using
  `mkForce`.

* `nginx` will be completely omitted if a user enables nextcloud
  and disables nginx using `services.nginx.enable = false;`. (because
  nginx will be enabled by this module using `mkDefault`).

This reverts commit 128dbb31cc.
Closes #95259
2020-08-12 18:28:45 +02:00
..
doc Merge pull request #91938 from spacefrogg/openafs-1.6-deprecation 2020-08-12 17:11:28 +02:00
lib Merge pull request #93824 from blitz/fix-rpi4-installer 2020-08-08 13:45:02 +02:00
maintainers nixos/maintainers/*: editorconfig fixes 2020-08-04 00:23:54 +10:00
modules Revert "nextcloud: use mkDefault for whole nginx config" 2020-08-12 18:28:45 +02:00
tests shattered-pixel-dungeon: add nixos test 2020-08-09 15:34:30 -07:00
COPYING
default.nix
README treewide: use https for nixos.org and hydra.nixos.org 2020-05-03 22:14:21 -07:00
release-combined.nix nixos/release-combined: add systemd-networkd-ipv6-prefix-delegation test 2020-05-01 17:45:40 +02:00
release-small.nix nixos/release-small: drop latestKernel.login 2020-04-19 22:20:07 +03:00
release.nix nixos/release: add pantheon closure 2020-07-26 15:30:08 -04:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
https://nixos.org/nixos and in the manual in doc/manual.