Commit Graph

11512 Commits

Author SHA1 Message Date
Léo Gaspard
cae5598611
meta.tests: drop meta.needsVMSupport
Its job is already handled by `requiredSystemFeatures`
2018-11-11 23:11:46 +09:00
Léo Gaspard
aade4e577b
tests: disable some broken tests and/or restrict to x86_64 2018-11-11 23:11:46 +09:00
Léo Gaspard
83b27f60ce
tests: split into a separate all-tests.nix file
This will make the list much easier to re-use, eg. for `nixosTests`

The drawback is that this approaches makes the
```
nix-build release.nix -A tests.opensmtpd.x86_64-linux
```
command about twice as slow (3s to 6s): it now has to evaluate `nixpkgs`
once for each architecture, instead of just having the hardcoded list of
tests that allowed to say “ok just evaluate for x86_64-linux”.

On the other hand, complete evaluation of `release.nix` should be much
faster because we no longer import `nixpkgs` for each test: testing with
the following command went from 30s to 18s, and that's just for a few
tests.
```
time nix-instantiate --eval --strict nixos/release.nix -A tests.nat
```
I initially wanted to test on the whole `release.nix`, but there are too
many broken tests and it takes too long to eval them all, especially
compared to the fact that the current implementation breaks some setup.

Given developers can just `nix-build nixos/tests/my-test.nix`, it sounds
like an overall win.
2018-11-11 23:11:46 +09:00
Léo Gaspard
6c68fbd4e1
tests: refactor to carry the package set as an argument
This way, the package set will be possible to pass without re-importing
all the time
2018-11-11 23:11:45 +09:00
Edward Tjörnhammar
888d01da48
nixos/minetest fix: add missing uid/gid for minetest 2018-11-11 12:47:09 +01:00
Silvan Mosberger
316ad96256
Merge pull request #50210 from aanderse/incron
nixos/incron: added nixos test to ensure expected behaviour
2018-11-11 03:37:10 +01:00
Aaron Andersen
24af0bc2b5 nixos/incron: added nixos test to ensure expected behaviour 2018-11-10 20:54:10 -05:00
Silvan Mosberger
e888a997d0
Merge pull request #49743 from nh2/glusterfs-4.0.0
glusterfs: 3.12.12 -> 4.0.0
2018-11-11 01:42:48 +01:00
Robert Hensing
b60dccbf4f NixOS: update config.nixpkgs.pkgs documentation 2018-11-10 23:21:21 +01:00
Jörg Thalheim
1d261945c7
Merge pull request #50113 from ryantm/monit
nixos/monit: change type of 'config' option to lines
2018-11-10 14:47:38 +00:00
Jörg Thalheim
4ec41a9a9e
Merge pull request #50115 from Ekleog/nextcloud-pgsql-unix
nextcloud module: document process for using with pgsql unix auth
2018-11-10 14:37:18 +00:00
Silvan Mosberger
9c984b06c4
Merge pull request #38514 from disassembler/grafana-reporter
grafana-reporter: init at 2.0.1
2018-11-10 15:15:21 +01:00
Silvan Mosberger
e468a1091b
Merge pull request #48687 from danielrutz/port-type
Add port type
2018-11-10 15:12:07 +01:00
Léo Gaspard
221e0fae38
nextcloud module: document process for using with pgsql unix auth 2018-11-10 12:30:54 +09:00
Silvan Mosberger
38b2520b96
Merge pull request #37365 from proteansec/pkgs/bacula
bacula: 5.2.13 -> 9.2.1
2018-11-10 04:23:28 +01:00
volth
5ea22a5b00 nixos/nix: ignore nix.checkConfig when cross-compiling (#48225)
* nixos/nix: ignore nix.checkConfig when cross-compiling

the check always fails because of architecture mismatch

* typos
2018-11-09 19:18:06 -06:00
Ryan Mulligan
8d0b95dc09 nixos/monit: change type of 'config' option to lines
By using types.lines for 'config', we can specify monit configurations
in lots of modules and they can all be automatically combined together
with newlines. This is desireable because different modules might want
to each specify the small monitoring task specific to their service.

This commit also updates the module to use current idioms.
2018-11-09 16:07:42 -08:00
Samuel Dionne-Riel
2f668e3248
Merge pull request #40043 from kierdavis/ckb-update-and-cleanup
ckb/ckb-next: 0.2.9 -> 0.3.2, and cleanup
2018-11-09 23:59:58 +00:00
Vladyslav M
eb5a932eb7
Merge pull request #49671 from hyperfekt/bcachefs_cryptroot
bcachefs root support
2018-11-10 00:08:55 +02:00
adisbladis
86559259e5
Merge pull request #49876 from etu/add-dmrconfig-module-udev-rules
Add dmrconfig module udev rules
2018-11-09 12:04:20 +00:00
Franz Pletz
8ba51ef5ec
Merge pull request #49809 from griff/rspamd-workers
nixos/rspamd: Multiple workers, extraConfig priority & postfix integration
2018-11-09 02:55:02 +00:00
Brian Olsen
e01605be15
nixos/rspamd: Add options for postfix integration
The `rmilter` module has options for configuring `postfix` to use it but
since that module is deprecated because rspamd now has a builtin worker
that supports the milter protocol this commit adds similar `postfix`
integration options directly to the `rspamd` module.
2018-11-09 01:31:27 +01:00
Renaud
6399b103d8
Merge pull request #49814 from aanderse/gitea
nixos/gitea: fix mysql issue, add mysql socket auth, and add a nixos test
2018-11-08 23:45:46 +01:00
Aaron Andersen
0dde47a58a nixos/gitea: add a nixos test to ensure the initial database migration succeeds so the application can start 2018-11-08 17:31:05 -05:00
Aaron Andersen
3ed52c7804 nixos/gitea: add mysql socket authentication as an option 2018-11-08 17:30:58 -05:00
Aaron Andersen
0bbb6f4f2a nixos/gitea: fix systemd after target when mysql is the database of choice 2018-11-08 17:30:36 -05:00
Sander van der Burg
530b4bcadd nixos/alerta: create new module + add kapacitor integration 2018-11-08 22:34:23 +01:00
Antoine Eiche
50d9f551cb nixos/tests/hydra: set the project visible
If projects are not visible, the are not taken into account by search
queries and it's quite hard to debug!
2018-11-08 08:47:40 +01:00
Elis Hirwing
a1f23bf1c8
nixos/dmrconfig: Add module to enable udev rules 2018-11-08 08:37:44 +01:00
Michael Raskin
adf41ed942
Merge pull request #49864 from oxij/pkgs/tiny-things
trivial: tiny cleanups and fixes
2018-11-08 06:28:10 +00:00
Jan Malakhovski
2403464720 nixos/release.nix: generalize modules copy-paste into makeModules 2018-11-08 05:20:09 +00:00
rnhmjoj
21dfccd93d
nixos/manual: move syncthing notice in the right position 2018-11-07 08:32:03 +01:00
Timo Kaufmann
6141939d6e
Merge pull request #44439 from Ekleog/meta-tests
[RFC] Use `meta.tests` to link from packages to the tests that test them
2018-11-07 00:05:22 +01:00
Jörg Thalheim
bac872592c
Typo in clone-config
Co-Authored-By: DIzFer <david@izquierdofernandez.com>
2018-11-06 23:08:26 +01:00
David Izquierdo
6abe1e5981 Even more typos in hardened 2018-11-06 22:54:43 +01:00
Jan Tojnar
6be1696c80
Update nixos/doc/manual/configuration/profiles/demo.xml
Co-Authored-By: DIzFer <david@izquierdofernandez.com>
2018-11-06 22:51:33 +01:00
Jan Tojnar
dbd1a5f216
Second typo in docker-container
Co-Authored-By: DIzFer <david@izquierdofernandez.com>
2018-11-06 22:50:25 +01:00
Jan Tojnar
c7e3f19fc2
Fixed typo in docker-container
Co-Authored-By: DIzFer <david@izquierdofernandez.com>
2018-11-06 22:49:44 +01:00
Jörg Thalheim
f488a072f9
Update nixos/doc/manual/configuration/profiles/clone-config.xml
Co-Authored-By: DIzFer <david@izquierdofernandez.com>
2018-11-06 22:48:05 +01:00
Markus Kowalewski
a0371d4761
nixos/postgresqlBackup: set to umask to 0077
* Ensure that the backup file is only readable by the owner
* Add file permission test to tests
2018-11-06 21:59:29 +01:00
sveitser
13892da3e7 nixos/jupyter: wait for network.target 2018-11-06 20:40:20 +01:00
Franz Pletz
159a5f31bc
Merge pull request #49792 from griff/rspamd-multifile-enable
nixos/rspamd: Fix enable for locals and overrides
2018-11-06 18:25:47 +00:00
Janne Heß
c7f5457aa6 nixos/mysql: Explicitly set datadir in my.cnf
While this seems silly at first (it's already given as start parameter
to mysqld), it seems like xtrabackup needs that sometimes.
Without it, a Galera cluster cannot be run using the xtrabackup
replication method.
2018-11-06 18:38:28 +01:00
Patrick Hilhorst
ce65df3a36
nixos-generate-config: fix for swapless kernels
Fixes #49826
2018-11-06 17:32:54 +01:00
David Izquierdo
b303688f46 Docs: init section QEMU Guest in chapter Profiles 2018-11-06 12:58:41 +01:00
David Izquierdo
62e64978d2 Docs: init section Minimal in chapter Profiles 2018-11-06 12:58:30 +01:00
David Izquierdo
d2af8fb3d2 Docs: init section Installation Device in chapter Profiles 2018-11-06 12:58:14 +01:00
David Izquierdo
670ee54a28 Docs: init section Headless in chapter Profiles 2018-11-06 12:58:05 +01:00
David Izquierdo
614ea40443 Docs: init section Hardened in chapter Profiles 2018-11-06 12:57:50 +01:00
David Izquierdo
b10d669919 Docs: init section Graphical in chapter Profiles 2018-11-06 12:57:37 +01:00
David Izquierdo
207bbdcb91 Docs: init section Docker Container in chapter Profiles 2018-11-06 12:57:25 +01:00
David Izquierdo
40f2cdb302 Docs: init section Demo in chapter Profiles 2018-11-06 12:56:48 +01:00
David Izquierdo
e6445abe64 Docs: Stub for section Clone Config in chapter Profiles 2018-11-06 12:56:22 +01:00
David Izquierdo
4c02d4cb55 Docs: init section Base in chapter Profiles 2018-11-06 12:56:07 +01:00
David Izquierdo
57d9bc4ce2 Docs: init chapter Profiles with section All Hardware 2018-11-06 12:55:37 +01:00
Peter Simons
a7afcff928 nixos: packagekit can no longer use "nix" default back-end
The code in question does not support Nix 2.0 yet.

Closes https://github.com/NixOS/nixpkgs/issues/49793.
2018-11-06 12:13:14 +01:00
Jörg Thalheim
b2099d21cf
Merge pull request #49354 from aanderse/fstab-escaping
filesystems: escape spaces in fstab with \040
2018-11-06 11:09:02 +00:00
Sarah Brofeldt
81de3e39b0
Merge pull request #49516 from johanot/kubedns-to-coredns
nixos/kubernetes: KubeDNS -> CoreDNS
2018-11-06 10:30:49 +01:00
hyperfekt
95b2b6f541 nixos/bcachefs: enable encrypted root
Enables automatic decryption for bcachefs-formatted filesystems needed during boot.
2018-11-06 09:26:35 +01:00
Kier Davis
de009133d4
ckb-next: move option renames to nixos/modules/rename.nix for consistency 2018-11-06 00:50:00 +00:00
Kier Davis
3b7984dd51
Merge branch 'master' into ckb-update-and-cleanup 2018-11-06 00:47:14 +00:00
Brian Olsen
fba69f388b
nixos/rspamd: Put extraConfig in included files
The lines stored in `extraConfig` and `worker.<name?>.extraConfig`
should take precedent over values from included files but in order to do
this in rspamd UCL they need to be stored in a file that then gets
included with a high priority. This commit uses the overrides option to
store the value of the two `extraConfig` options in `extra-config.inc`
and `worker-<name?>.inc` respectively.
2018-11-06 00:34:23 +01:00
Brian Olsen
46ef075e7d
nixos/rspamd: Add defaults for rspamd_proxy worker 2018-11-06 00:32:14 +01:00
Brian Olsen
3a4459a305
nixos/rspamd: Support multiple workers
When the workers option for rspamd was originally implemented it was
based on a flawed understanding of how workers are configured in rspamd.
This meant that while rspamd supports configuring multiple workers of
the same type, so that different controller workers could have different
passwords, the NixOS module did not support this because it would write
an invalid configuration file if you tried.

Specifically a configuration like the one below:

```
workers.controller = {};
workers.controller2 = {
  type = "controller";
};
```

Would result in a rspamd configuration of:

```
worker {
  type = "controller";
  count = 1;
  .include "$CONFDIR/worker-controller.inc"
}
worker "controller2" {
  type = "controller";
  count = 1;
}
```

While to get multiple controller workers it should instead be:

```
worker "controller" {
  type = "controller";
  count = 1;
  .include "$CONFDIR/worker-controller.inc"
}
worker "controller" {
  type = "controller";
  count = 1;
}
```
2018-11-06 00:26:55 +01:00
Brian Olsen
c853b34824
nixos/rspamd: Fix enable for locals and overrides
When implementing #49620 I included an enable option for both the
locals and overrides options but the code writing the files didn't
actually look at enable and so would write the file regardless of its
value. I also set the type to loaOf which should have been attrsOf
since the code was not written to handle the options being lists.

This fixes both of those issues.
2018-11-05 17:50:34 +01:00
Gabriel Ebner
57dd484333
Merge pull request #49778 from gebner/rngd-version
nixos/rngd: do not pass --version flag
2018-11-05 12:23:37 +01:00
Gabriel Ebner
20078fd5b2 nixos/rngd: do not pass --version flag 2018-11-05 10:41:38 +01:00
Sarah Brofeldt
95486ca306 Revert "NixOS tests: Wait for shell for 10x longer (50m)"
This reverts commit 9bc10e1291.
2018-11-05 08:58:08 +00:00
Matthew Bauer
d3c2247b77
Merge pull request #47679 from NixOS/docs-make-channel
Document make-channel.nix
2018-11-04 16:51:28 -06:00
Robert Hensing
b682778366 nixos/../nixpkgs.nix: Add assertions to check pkgs' system 2018-11-04 23:09:43 +01:00
Robert Hensing
51c6f51390 Merge remote-tracking branch 'upstream/master' into nixos-nixpkgs-pkgs-use-overlays 2018-11-04 21:33:16 +01:00
Robert Hensing
17e863d017 Remove incorrect sentence from make-channel comment
Besides being incorrect, claims like these tend to stick around
after they become incorrect.
2018-11-04 20:45:49 +01:00
Matthew Bauer
2b604c2836
Merge pull request #49670 from matthewbauer/pkgs-i686-remove
Fix pkgsi686Linux assertion
2018-11-04 12:49:09 -06:00
Michael Raskin
6b8252d367
Merge pull request #44303 from pvgoran/tomcat-clean-basedir
nixos/tomcat: add purifyOnStart option
2018-11-04 17:50:38 +00:00
Andreas Rammhold
6795bdd58c nixos/prometheus: check configuration before starting service
With `promtool` we can check the validity of a configuration before
deploying it. This avoids situations where you would end up with a
broken monitoring system without noticing it - since the monitoring
broke down. :-)
2018-11-04 15:08:44 +01:00
Andreas Rammhold
0de150e0f2 nixos/prometheus: add package option
With a package option we can let the user decide what package to use for
prometheus without requiring an overlay.
2018-11-04 15:08:44 +01:00
Robert Hensing
03fc1167e8
Merge branch 'master' into nixos-nixpkgs-pkgs-use-overlays 2018-11-04 14:19:33 +01:00
Robert Hensing
2adb521d3d
Merge pull request #49746 from NixOS/fix-nixos-bash-completion-comment
nixos: programs.bash: Fix comment about completion
2018-11-04 13:44:08 +01:00
Andreas Rammhold
c891dac82f
Merge pull request #49283 from aanderse/solr
solr: 4.10.3 -> 7.5.0, refactor service to reflect major changes in version bump
2018-11-04 13:24:15 +01:00
Robert Hensing
c4f6745e72
nixos: programs.bash: Fix comment about completion
`XDG_DATA_DIRS` already includes what is typically the `share` directory.
Adding an extra `share` breaks it.
2018-11-04 13:06:13 +01:00
Michael Weiss
f319c7fc89
Merge pull request #49687 from gnidorah/sway
sway-beta module: add missing pieces
2018-11-04 11:54:03 +01:00
Niklas Hambüchen
c3cddfcef1 glusterfs: 3.12.2 -> 4.0.0 2018-11-04 11:18:15 +01:00
Niklas Hambüchen
92f40bab2b glusterfs service: Switch to simple unit instead of forking.
Gluster's pidfile handling is bug-ridden.

I have fixed https://bugzilla.redhat.com/show_bug.cgi?id=1509340
in an attempt to improve it but that is far from enough.

The gluster developers describe another pidfile issue as
"our brick-process management is a total nightmare", see
f1071f17e0/xlators/mgmt/glusterd/src/glusterd-utils.c (L5907-L5924)

I have observed multiple cases where glusterd doesn't start correctly
and systemd doesn't notice because of the erroneous pidfile handling.

To improve the situation, we don't let glusterd daemonize itself any more
and instead use `--no-daemon` and the `Simple` service type.
2018-11-04 11:09:30 +01:00
Robin Gloster
eadb998581
gitlab module: fix config handling 2018-11-04 00:26:01 +01:00
Joachim F
9c44eebbbd
Merge pull request #49620 from griff/rspamd-multifile
nixos/rspamd: Add support for included files
2018-11-03 19:06:02 +00:00
Robert Hensing
5341e145c3 release-notes/19.03: nixpkgs.pkgs and nixpkgs.overlays now combine 2018-11-03 19:48:42 +01:00
Robert Hensing
4aa30166d1 rabbitmq module: Update documentation after proofreading
Thanks @c0bw3b, @lsix!
2018-11-03 19:19:04 +01:00
Niklas Hambüchen
32c2d48524 nixos manual: Add changelog for consul
Signed-off-by: Niklas Hambüchen <mail@nh2.me>
2018-11-03 18:44:48 +01:00
Niklas Hambüchen
2cb7f5fb1e consul: 0.9.3 -> 1.3.0.
Removes the old UI build tooling; it is no longer necessary
because as of 1.2.0 it's bundled into the server binary.
It doesn't even need to have JS built, because it's bundled into
the release commit's source tree (see #48714).

The UI is enabled by default, so the NixOS service is
updated to directly use `ui = webUi;` now.

Fixes #48714.
Fixes #44192.
Fixes #41243.
Fixes #35602.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
2018-11-03 18:39:46 +01:00
gnidorah
15c2fb7ba1 sway-beta module: add missing pieces 2018-11-03 20:27:40 +03:00
Aaron Andersen
1b725def23 solr: 4.10.3 -> 7.5.0, refactor service to reflect major changes in version bump, NixOS test included 2018-11-03 13:14:13 -04:00
hyperfekt
482228919c nixos/bcachefs: remove superfluous fsck from initrd
bcachefs checks the filesystem at mount time, therefore no separate fsck binary is needed in initrd.
2018-11-03 18:07:32 +01:00
Sarah Brofeldt
99c052bac4 nixos/google-network-daemon: systemd job type simple instead of oneshot (#49692) 2018-11-03 16:16:17 +01:00
Florian Klink
4d51002216
Merge pull request #49650 from srghma/srghma-patch-1
amazon-image: fix typo in comment
2018-11-03 16:04:47 +01:00
Matthew Bauer
4a8fc5b9aa treewide: remove pkgs_i686
This was getting evaluated eagerly causing assertion failures in
aarch64 systems. We can replace usages of pkgs_i686 with
pkgs.pkgsi686Linux.
2018-11-03 00:56:39 -05:00
Florian Klink
93f8ff68ea
Merge pull request #49658 from mayflower/gitlab-refactor
gitlab: refactor and fix test
2018-11-03 01:49:23 +01:00
lewo
3fb4eb1c43 nixos/dockerPreloader: preload docker images (#49379)
This module permits to preload Docker image in a VM in order to reduce
OIs on file copies. This module has to be only used in testing
environments, when the test requires several Docker images such as in
Kubernetes tests. In this case,
`virtualisation.dockerPreloader.images` can replace the
`services.kubernetes.kubelet.seedDockerImages` options.

The idea is to populate the /var/lib/docker directory by mounting qcow
files (we uses qcow file to avoid permission issues) that contain images.

For each image specified in
config.virtualisation.dockerPreloader.images:
1. The image is loaded by Docker in a VM
2. The resulting /var/lib/docker is written to a QCOW file

This set of QCOW files can then be used to populate the
/var/lib/docker:
1. Each QCOW is mounted in the VM
2. Symlink are created from these mount points to /var/lib/docker
3. A /var/lib/docker/image/overlay2/repositories.json file is generated
4. The docker daemon is started.
2018-11-03 01:00:53 +01:00
Robin Gloster
ec7cb84bf0
gitlab: refactor and fix test 2018-11-02 22:40:21 +01:00
Austin Seipp
2266f2014b nixos/postgresql: add myself as maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-02 13:52:33 -05:00
Austin Seipp
93aa285376 nixos: fix #48917 by setting SYSTEMD_TIMEDATED_NTP_SERVICES
Setting this variable in the environment of systemd-timedated allows
'timedatectl' to tell if an NTP service is running.

Closes #48917.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-02 09:10:15 -05:00