20594 Commits

Author SHA1 Message Date
Julien Langlois
f3828c53c9
nixos/services/kmscon: fix systemd configuration
This fixes https://github.com/NixOS/nixpkgs/issues/112616
2021-02-15 16:58:54 -05:00
Matej Urbas
a6766bee7b virtualization/amazon-init: enable option 2021-02-15 18:44:34 +00:00
github-actions[bot]
e88fb2d10c
Merge staging-next into staging 2021-02-15 18:17:10 +00:00
github-actions[bot]
0ca7d945c2
Merge master into staging-next 2021-02-15 18:17:06 +00:00
Maximilian Bosch
274109a8d6
Merge pull request #113108 from Ma27/nextcloud-acme
nixos/nextcloud: fix regex to not return 404 on ACME challenges
2021-02-15 18:53:35 +01:00
Maximilian Bosch
31864de85d
Merge pull request #113187 from Ma27/nextcloud-dav
nixos/nextcloud: redirect /.well-known/*dav to https url
2021-02-15 18:53:19 +01:00
Leonard Pollak
a9a100adf6 nixos/ceph: fix ceph.client.extraOptions type 2021-02-15 14:56:26 +01:00
github-actions[bot]
a1d9d57051
Merge staging-next into staging 2021-02-15 12:20:16 +00:00
github-actions[bot]
cd518a718b
Merge master into staging-next 2021-02-15 12:20:12 +00:00
Lassulus
2489d95c1c
Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages
nixos/users: use proper name for per-user packages
2021-02-15 12:45:24 +01:00
Izorkin
e3a7270e3d nixos/mastodon: fix mastodon-init-db script 2021-02-15 11:43:03 +01:00
Izorkin
4255954d97 nixos/mastodon: optimize permissions 2021-02-15 11:43:03 +01:00
Izorkin
424e7b0f5d nixos/mastodon: use unix socket to default 2021-02-15 11:43:03 +01:00
Izorkin
f1adea1a94 nixos/mastodon: add option trustedProxy 2021-02-15 11:43:03 +01:00
Maximilian Bosch
f89652a23e
nixos/nextcloud: redirect /.well-known/*dav to https url
Fixes #113155
2021-02-15 11:03:12 +01:00
github-actions[bot]
018f748b81
Merge staging-next into staging 2021-02-15 00:37:07 +00:00
github-actions[bot]
0630986bf7
Merge master into staging-next 2021-02-15 00:37:03 +00:00
Jan Solanti
3d69688289 pipewire: rename pwms to media-session 2021-02-14 23:54:23 +02:00
Jan Solanti
b9b9fff6d6 pipewire: use strictly upstream defaults 2021-02-14 23:54:17 +02:00
Aaron Andersen
796e3d6ff6
Merge pull request #111695 from jansol/xow
xow: fix service
2021-02-14 13:32:55 -05:00
github-actions[bot]
056f697397
Merge staging-next into staging 2021-02-14 18:16:17 +00:00
github-actions[bot]
4f3b8e7b41
Merge master into staging-next 2021-02-14 18:16:14 +00:00
Luke Granger-Brown
bfc11c643d nixos/tests/ceph-single-node-bluestore: init
The current Ceph tests use the old method for OSDs to store data on
disks, known as Filestore. This means there are no tests for the
Bluestore functionality that run on install, which means that things
like RocksDB being broken can slip through and break the Bluestore
functionality in a subtle and difficult to debug manner.

Add a test to check that Bluestore works, at least on a single node.
2021-02-14 18:05:57 +00:00
Jean-Paul Calderone
9338023577
Fix typo in the GitLab smtp auth options docs 2021-02-14 09:55:54 -05:00
Maciej Krüger
8429831b67
Merge pull request #112746 from mkg20001/qemu-extra-disks 2021-02-14 13:20:44 +01:00
Maciej Krüger
59eb6d3ee3
nixosTests.*: update to use virtualisation.fileSystems 2021-02-14 12:23:50 +01:00
Maximilian Bosch
055b7e2a5d
nixos/nextcloud: fix regex to not return 404 on ACME challenges
Fixes #113027
2021-02-14 12:23:16 +01:00
github-actions[bot]
45fadd9b7f
Merge staging-next into staging 2021-02-14 00:37:59 +00:00
github-actions[bot]
8d8fe35281
Merge master into staging-next 2021-02-14 00:37:56 +00:00
pasqui23
04ef00987a
nixos/switcheroo-control: add to modules-list.nix (#113052) 2021-02-14 01:06:01 +01:00
WORLDofPEACE
452f7e14d4 nixos/tools: generate an xserver config
The desktop configuration won't enable xserver.
If there's multiple desktops enabled they will now evaluate properly.
2021-02-13 18:46:01 -05:00
WORLDofPEACE
94f0210e60 nixos/tools: make desktopConfiguation types.listOf types.lines
This fixes #108124.
2021-02-13 18:45:27 -05:00
Martin Weinelt
286f8cdbfc Merge branch 'master' into staging-next 2021-02-14 00:40:47 +01:00
zowoq
37f1ed7ca4 nixos/podman: install systemd files
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:39 +10:00
github-actions[bot]
d10b7b45fb
Merge staging-next into staging 2021-02-13 18:16:03 +00:00
github-actions[bot]
1c7975a26f
Merge master into staging-next 2021-02-13 18:15:59 +00:00
Ninjatrappeur
2f80425e6e
Merge pull request #112801 from erosennin/prosody-tests
nixos/prosody: fix broken tests
2021-02-13 15:22:48 +01:00
Milan
3b77e7c967
nixos/jitsi-videobridge: add apis option (#112960)
The `--apis=` command line parameter passed to Jitsi Videobridge is
required to monitor a Jitsi Meet instance for example via the prometheus
exporter [jitsiexporter](https://git.xsfx.dev/prometheus/jitsiexporter).
2021-02-13 15:04:58 +01:00
github-actions[bot]
37c77840b8
Merge staging-next into staging 2021-02-13 12:19:41 +00:00
github-actions[bot]
257f90a43f
Merge master into staging-next 2021-02-13 12:19:38 +00:00
Jörg Thalheim
c875e8e673
Merge pull request #107394 from yorickvP/beam-nox 2021-02-13 09:01:06 +00:00
github-actions[bot]
1e189fbb9e
Merge staging-next into staging 2021-02-13 06:16:37 +00:00
github-actions[bot]
318f95e4c2
Merge master into staging-next 2021-02-13 06:16:33 +00:00
aszlig
2d5a31a3ef
Merge pull request #112819 (mkIf in systemd units)
@thelegy writes:

  unitOption is only used inside of attrsOf wich is perfectly capable of
  handling the attrsets from mkIf, though the checkUnitConfig test
  forbids it.

  This commit weakens that restriction to allow the usage of mkIf inside
  of systemd.services.<name>.serviceConfig.<something> etc.

While I personally don't like that we can't easily use
pushDownProperties from the module system and need to rely on internals,
we *already* use internals for the mkOverride case, so adding another
case for mkIf doesn't add a hard-to-find indirection.

I'm merging this, since this fixes a valid use case and it shouldn't
make refactoring worse than before.
2021-02-13 05:24:11 +01:00
Ryan Burns
5828d54356 nixosTests.installer: fix non-zfs grub tests
Now that grub2 is built without zfs support when possible, this is a
separate store path which may need to be made available to the installer.
2021-02-12 19:39:17 -08:00
github-actions[bot]
c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
github-actions[bot]
1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Luke Granger-Brown
cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
erictapen
b2dbb4f50e
nixos/mastodon: set environment for mastodon-init-dirs (#112917)
mastodon-init-dirs should have the same environment as the other
services, as it also calls rake. Especially RAILS_ENV was missing.
2021-02-12 20:31:44 +01:00
github-actions[bot]
0667f269fc
Merge staging-next into staging 2021-02-12 18:16:50 +00:00