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
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
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
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
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
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
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
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