Jörg Thalheim
4cc7c2e55a
tmpfiles: load user-defined entries first
...
systemd-tmpfiles will load all files in lexicographic order and ignores rules
for the same path in later files with a warning Since we apply the default rules
provided by systemd, we should load user-defines rules first so users have a
chance to override defaults.
2020-04-16 13:02:24 +01:00
Maximilian Bosch
74d6e86ec2
nixos/doc: fix database-setup example for matrix-synapse
...
Closes #85327
2020-04-16 11:38:15 +02:00
Arian van Putten
5c1c642939
Revert "nixos/acme: Fix allowKeysForGroup not applying immediately"
...
This reverts commit 5532065d0690645f0a813fed6e68163b0f4774d4.
As far as I can tell setting RemainAfterExit=true here completely breaks
certificate renewal, which is really bad!
the sytemd timer will activate the service unit every OnCalendar=,
however with RemainAfterExit=true the service is already active! So the
timer doesn't rerun the service!
The commit also broke the actual tests, (As it broke activation too)
but this was fixed later in https://github.com/NixOS/nixpkgs/pull/76052
I wrongly assumed that PR fixed renewal too, which it didn't!
testing renewals is hard, as we need to sleep in tests.
2020-04-16 10:37:04 +02:00
Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging
2020-04-16 10:10:38 +02:00
Maximilian Bosch
2d55f9c01a
Merge pull request #84266 from Ma27/nspawn-overrides
...
nixos/systemd-nspawn: disallow multiple packages with `.nspawn`-units
2020-04-16 00:24:33 +02:00
Maximilian Bosch
70ecf83c33
Merge pull request #82339 from Ma27/captive-browser-xdg
...
nixos/captive-browser: set chromium's data-dir to a XDG-compliant location
2020-04-16 00:06:12 +02:00
Maximilian Bosch
dca0b71876
Merge pull request #85162 from Ma27/build-vms-file-loc
...
nixos/build-vms: propagate file location
2020-04-15 17:42:12 +02:00
jakobrs
34f242c13d
nixos/installer: Add terminus_font to installation_iso_base
2020-04-15 14:21:42 +02:00
Michele Guerini Rocco
da232ea497
Merge pull request #78129 from flyfloh/airsonic-vhost
...
airsonic: fix virtualHost option
2020-04-15 09:18:28 +02:00
Matthew Bauer
57e20c5d87
Merge pull request #83362 from bachp/boinc
...
nixos/boinc: simplify setup of boinc service
2020-04-14 15:55:54 -04:00
Maximilian Bosch
57087ea280
Merge pull request #85165 from mayflower/alertmanager-clustering
...
prometheus/alertmanager: implement HA clustering support
2020-04-14 16:13:34 +02:00
worldofpeace
6304c9af48
Merge pull request #85222 from mayflower/libinput-manual-ref
...
nixos/libinput: refer to libinput manual
2020-04-14 09:42:55 -04:00
worldofpeace
e4c5e68fca
Merge pull request #84255 from prikhi/lightdm-mini-greeter-040
...
lightdm-mini-greeter: 0.3.4 -> 0.4.0
2020-04-14 08:38:23 -04:00
Linus Heckemann
9953a26be1
nixos/libinput: refer to libinput manual
2020-04-14 14:31:49 +02:00
Sander van der Burg
0ffb720e8c
nixos/dysnomia: fix documentRoot property
2020-04-14 14:31:13 +02:00
Michele Guerini Rocco
86d71ddbed
Merge pull request #85170 from flokli/networking-virtual
...
nixos/networking: fix setting MAC Address and MTU in networkd, fix tests
2020-04-14 14:20:49 +02:00
Jörg Thalheim
fd438d5f09
Merge pull request #85185 from m1cr0man/legoaccounts
...
acme: share accounts between certificates
2020-04-14 13:12:57 +01:00
Jaka Hudoklin
de6891ffd0
Merge pull request #83930 from xtruder/nixos/virtualisation/hyperv-image
...
modules/virtualisation: add hyperv-image
2020-04-14 03:27:22 +00:00
John Ericson
c8a6ea5161
Merge remote-tracking branch 'upstream/master' into staging
2020-04-13 22:17:15 -04:00
Lucas Savva
827d5e6b44
acme: share accounts between certificates
...
There are strict rate limits on account creation for Let's Encrypt
certificates. It is important to reuse credentails when possible.
2020-04-14 00:15:16 +01:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
...
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Florian Klink
532528190b
nixos/networking: move network-link-${i.name} to scripted networking
...
The unit sets MTU and MAC Address even with networkd enabled, which
isn't necessary anymore, as networkd handles this by itself.
2020-04-13 22:03:35 +02:00
Florian Klink
ca391c8a4f
nixos/networking: add assertion catching setting mac addresses on tun devices
...
Setting a MAC Address on a tun interface isn't supported, and invoking
the corresponding command fails.
2020-04-13 22:03:35 +02:00
Florian Klink
cddc7a28b8
nixos/networking: fix setting .macAddress and .mtu with networkd
...
This needs to be set in the .linkConfig of a .network
2020-04-13 22:03:35 +02:00
Robin Gloster
e484ca3d9b
alertmanager: implement HA clustering support
2020-04-13 18:39:51 +02:00
Jörg Thalheim
4c3f1d321a
Merge pull request #76723 from jokogr/u/traefik-2.1.1
...
Traefik: 1.7.14 -> 2.2.0
2020-04-13 17:16:54 +01:00
Maximilian Bosch
ec6bac99cc
nixos/build-vms: propagate file location
...
When trying to build a VM using `nixos-build-vms` with a configuration
that doesn't evaluate, an error "at `<unknown-file>`" is usually shown.
This happens since the `build-vms.nix` creates a VM-network of
NixOS-configurations that are attr-sets or functions and don't contain
any file information. This patch manually adds the `_file`-attribute to
tell the module-system which file contained broken configuration:
```
$ cat vm.nix
{ vm.invalid-option = 1; }
$ nixos-build-vms vm.nix
error: The option `invalid-option' defined in `/home/ma27/Projects/nixpkgs/vm.nix@node-vm' does not exist.
(use '--show-trace' to show detailed location information)
```
2020-04-13 17:50:13 +02:00
Mario Rodas
66e43c6588
Merge pull request #84599 from doronbehar/nodejs-python3
...
nodejs: use python3 if possible
2020-04-13 07:44:05 -05:00
Maximilian Bosch
1bf1ae3966
Merge pull request #85092 from mayflower/prometheus-local-config-gen
...
prometheus: use runCommandNoCCLocal for config gen
2020-04-13 11:03:16 +02:00
Ioannis Koutras
1f61fbf326
nixos/traefik: make config deep mergeable
2020-04-12 22:50:36 +02:00
Ioannis Koutras
bc766b003a
nixos/traefik: Adapt to traefik v2
...
This commit:
1. Updates the path of the traefik package, so that the out output is
used.
2. Adapts the configuration settings and options to Traefik v2.
3. Formats the NixOS traefik service using nixfmt.
2020-04-12 22:50:36 +02:00
Robin Gloster
0e040d16e8
prometheus: use runCommandNoCCLocal for config gen
2020-04-12 20:13:23 +02:00
Graham Christensen
56c8b7eeda
Merge pull request #84946 from bqv/nftables
...
nixos/nftables: fix typo in ruleset example
2020-04-12 09:38:55 -04:00
Graham Christensen
35d8514a91
Merge pull request #81848 from grahamc/nested-specialisation
...
specialisation: replace nesting with named configurations
2020-04-12 08:56:11 -04:00
Graham Christensen
ec2d28e323
specialisation: replace nesting with named configurations
...
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2020-04-12 08:12:50 -04:00
Emily
91c6809946
nixos/stage-1: check secret paths before copying
...
Fixes #84976 .
2020-04-11 16:42:47 +01:00
Emily
8a37c3dd1a
nixos/initrd-ssh: fix typo in docs
2020-04-11 16:19:48 +01:00
Frederik Rietdijk
f8c6921e97
hydra: wrap executables with hydra env vars
...
We already set the relevant env vars in the systemd services. That does
not help one when executing any of the executables outside a service,
e.g. when creating a new user.
2020-04-11 14:36:42 +02:00
Maximilian Bosch
c9504b0b68
Merge pull request #84940 from symphorien/rouncube-spell
...
roundcube: use pspell for spellchecking
2020-04-11 14:33:43 +02:00
worldofpeace
15d5a2adc1
Merge pull request #84849 from samueldr/fix/nextcloud-upgrade-wording
...
nextcloud: Review installation upgrade warning wording
2020-04-10 22:55:20 -04:00
Tony Olagbaiye
c1c9905aae
nixos/nftables: fix typo in ruleset example
2020-04-10 23:48:52 +01:00
Eelco Dolstra
aa084e2a24
nix: Fix fallback paths
2020-04-10 21:13:15 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
edef
6fbacea8e5
Merge pull request #84602 from alyssais/ssh
...
nixos/ssh: don't accept ssh-dss keys
2020-04-10 16:05:36 +00:00
Eelco Dolstra
cea352d276
nix: 2.3.3 -> 2.3.4
2020-04-10 17:23:28 +02:00
Symphorien Gibol
9e417bc9e3
roundcube: use pspell for spellchecking
...
By default, upstream enables a third party service in the cloud:
https://github.com/roundcube/roundcubemail/blob/1.4.3/config/defaults.inc.php#L790-L798
2020-04-10 12:00:00 +00:00
worldofpeace
df8c30fa25
iso-image: make $ARCH shorter
...
we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.
Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"
(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64
(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```
2020-04-09 20:10:01 -04:00
worldofpeace
a775961c8f
Revert "Revert "iso-image: normalize volumeID""
...
This reverts commit 21b50e6f6879f22b9261362bfd6dce26b7611e18.
2020-04-09 20:06:32 -04:00
worldofpeace
21b50e6f68
Revert "iso-image: normalize volumeID"
2020-04-09 19:43:59 -04:00
worldofpeace
8583d99e42
Merge pull request #83551 from worldofpeace/iso-id
...
iso-image: normalize volumeID
2020-04-09 19:31:52 -04:00