Robin Gloster
9ace7f6409
roundcube: clean-up and add test
2018-11-28 18:52:10 +01:00
Victor SENE
2f8073bd92
roundcube: IPv6 by default
2018-11-28 18:52:10 +01:00
Victor SENE
195fa0dafc
nixos/roundcube: add to module-list
2018-11-28 18:52:09 +01:00
Victor SENE
b5120953c6
nixos/roundcube: add roundcube module and default configuration
2018-11-28 18:52:08 +01:00
Léo Gaspard
f161f02552
Merge branch 'pr-51043'
...
* pr-51043:
nixos/urxvtd: remove socket activation
2018-11-29 00:50:01 +09:00
Brandon Black
dacbd5a61a
nixos/ntp: use upstream default restrictions to avoid DDoS ( #50762 )
...
Fixes #50732
2018-11-28 10:15:25 +00:00
Silvan Mosberger
5b56b28a5a
Merge pull request #51065 from bbigras/sway
...
nixos/sway-beta: pass arguments from wrapper to sway
2018-11-27 23:57:10 +01:00
Silvan Mosberger
331755f959
Merge pull request #51085 from erikarvstedt/container-config
...
containers: simplify env var definition
2018-11-27 23:45:02 +01:00
Domen Kožar
d04fedd715
postgresql: Enable systemd integration for 9.6+
...
This allows, finally, proper detection when postgresql is ready to
accept connections. Until now, it was possible that services depending
on postgresql would fail in a race condition trying to connect
to postgresql.
2018-11-27 19:16:21 +00:00
Graham Christensen
6db866cbd2
Revert "zfs cannot be distributed. Disabling it in the isos."
...
ZFS's popularity is growing, and not including it by default is a
bit frustrating. On top of that, the base iso includes ZFS
_anyway_ due to other packages depending upon it.
I think we're in the clear to do this on the basis that Oracle
probably doesn't care, it is probably fine (the SFLC agrees) and
we're a small fish. If a copyright holder asks us to, we can
definitely revert it again.
This reverts commit 33d07c7ea9
2018-11-26 17:51:18 -05:00
Erik Arvstedt
c64a9718ce
nixos/containers: simplify env var definition
...
Also clear up the misleading comment: This env var isn't
root-specific, it's needed for all users.
2018-11-26 23:06:56 +01:00
Arian van Putten
7ce4cd4470
nixos/nspawn: Fix small typo ( #51077 )
...
This has slipped through review in my previous PR it seems
2018-11-26 22:05:13 +01:00
Bruno Bigras
cc21100623
nixos/sway-beta: pass arguments from wrapper to sway
2018-11-26 11:55:05 -05:00
Jean-Philippe Braun
cdacdc0686
nixos/kubernetes: allow to disable clusterCidr
...
Fix option type and set --allocate-node-cidr to false if no clusterCidr
is defined.
2018-11-26 16:36:30 +01:00
Ding Xiang Fei
88570538b3
google-compute-image: make it a module and the size tuneable ( #49854 )
...
* move GCE system configuration to `google-compute-config.nix`
* remove `fetch-ssh-keys` service (disabled in comment)
2018-11-26 14:51:00 +00:00
Ding Xiang Fei
b011049cf6
Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo
2018-11-26 12:04:07 +08:00
fishyfriend
b34b39cab4
nixos/urxvtd: remove socket activation
...
This fixes #23193 . urxvtd is not presently compatible with socket activation.
2018-11-25 15:25:19 -05:00
Silvan Mosberger
b5f4f228d6
Merge pull request #51012 from griff/rspamd-proxy-type
...
nixos/rspamd: Allow worker type to be proxy again
2018-11-25 21:07:42 +01:00
Renaud
6a5fff3741
Merge pull request #51001 from c0bw3b/cleanup/more-https
...
Treewide: use more HTTPS-enabled sources
2018-11-25 16:22:34 +01:00
Brian Olsen
0d753af661
nixos/rspamd: Allow worker type to be proxy again
...
When reworking the rspamd workers I disallowed `proxy` as a type and
instead used `rspamd_proxy` which is the correct name for that worker
type. That change breaks peoples existing config and so I have made this
commit which allows `proxy` as a worker type again but makes it behave
as `rspamd_proxy` and prints a warning if you use it.
2018-11-25 16:03:34 +01:00
Franz Pletz
c1d760f0bf
Merge pull request #50469 from mguentner/mxisd
...
mxisd: init at 1.2.0 plus service with test
2018-11-25 13:26:05 +00:00
Maximilian Güntner
efae5d43ef
modules: add mxisd with test
2018-11-25 14:24:10 +01:00
Craig Younkins
eff461c8ef
treewide: systemd timeout arguments to use infinity instead of 0 ( #50934 )
...
Fixes https://github.com/NixOS/nixpkgs/issues/49700
2018-11-25 13:33:22 +01:00
c0bw3b
5e4ceba7bf
nixos/mediawiki: fetch over https
2018-11-24 23:18:26 +01:00
c0bw3b
c615b0504b
nixos/flashpolicyd: fix url and use https
2018-11-24 23:13:09 +01:00
c0bw3b
434eab9955
nixos/systemhealth: fix url and use https
2018-11-24 23:07:30 +01:00
c0bw3b
2ea29c63af
nixos/hpsa: use https
2018-11-24 23:05:10 +01:00
Joachim Fasting
6a7f02d89d
nixos/hardened: restrict access to nix daemon
2018-11-24 16:06:21 +01:00
Joachim F
e426613174
Merge pull request #50950 from jonasnick/nixos-tor-hiddenservice-version
...
nixos/tor: add HiddenServiceVersion option
2018-11-24 12:41:37 +00:00
Michael Raskin
5e159d463b
Merge pull request #49228 from Ekleog/rss2email-module
...
rss2email module: init
2018-11-23 22:30:29 +00:00
Jonas Nick
5640aa2814
nixos/tor: add HiddenServiceVersion option
2018-11-23 20:53:02 +00:00
Andreas Rammhold
51c3082119
nixos/prometheus: require one alertmanager configuration parameter
...
This commit adds an assertion that checks that either `configFile` or
`configuration` is configured for alertmanager. The alertmanager config
can not be an empty attributeset. The check executed with `amtool` fails
before the service even has the chance to start. We should probably not
allow a broken alertmanager configuration anyway.
This also introduces a test for alertmanager configuration that piggy
backs on the existing prometheus tests.
2018-11-23 19:45:17 +01:00
Andreas Rammhold
b1032db5a9
nixos/prometheus: check alertmanager configuration
2018-11-23 19:45:17 +01:00
Andreas Rammhold
d1ef00ebee
nixos/prometheus: add package option to alertmanager
2018-11-23 19:45:17 +01:00
Jörg Thalheim
50daffc4b8
nixos/docker-image: add example usage
2018-11-23 15:40:10 +00:00
Franz Pletz
4470dd9902
Merge pull request #50948 from Ma27/fix-nixos-build-vms-eval
...
nixos-build-vms: fix eval
2018-11-23 14:10:30 +00:00
Maximilian Bosch
b36fa8ef91
nixos-build-vms: fix eval
...
Previously I got the following error message:
```
error: opening file '/home/ma27/Projects/nixpkgs/nixos/modules/installer/default.nix': No such file or directory
```
Probably related to 6c68fbd4e1
2018-11-23 13:43:47 +01:00
Jörg Thalheim
d3aeed389c
Merge pull request #50641 from blaxill/firewallMerge
...
nixos/firewall: Always use global firewall.allowed rules
2018-11-23 11:42:16 +00:00
Ben Blaxill
308ab4ea25
Rename back to default and better release notes
2018-11-22 19:24:23 -05:00
Markus Kowalewski
25af518845
nixos/slurm: add extraConfigPaths options
2018-11-22 11:43:05 +01:00
Matthieu Coudron
35f74c3608
mininet: init at 2.3.0d4 ( #41261 )
...
Mininet (https://github.com/mininet/mininet ) is a popular network emulator that
glues several components such as network namespaces, traffic control
commands into a set of python bindings. It is then "easy" to describe a
topology and run experiments on it.
2018-11-21 23:33:10 +00:00
Jörg Thalheim
769735d8a1
netdata: create missing /etc/netdata
...
Since netdata 1.11.0 updated in https://github.com/NixOS/nixpkgs/pull/50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
2018-11-21 23:00:04 +00:00
Matthew Bauer
75999d4e38
Merge pull request #41887 from gmarmstrong/fix/seahorse-update
...
nixos/seahorse: require gnome3.dconf
2018-11-21 15:15:32 -06:00
Eelco Dolstra
09cbfea2ed
Revert "resolvconf.conf: Remove forced NSCD service restart"
...
This reverts commit d8c16bc54a
2018-11-21 15:26:37 +01:00
Ben Blaxill
32779b4c74
Refactor out the set operations
2018-11-20 21:29:33 -05:00
Jörg Thalheim
4a38cfbeb6
Merge pull request #48772 from hhomar/gnupg-tty-fix
...
gnupg: Fix, set current tty in interactive shell
2018-11-21 01:55:16 +00:00
Thomas Tuegel
25b8d4bd42
Merge pull request #50472 from jfrankenau/fix-penultimate
...
nixos/fontconfig: fix enable option of penultimate
2018-11-20 19:20:43 -06:00
Markus Kowalewski
ae93ed0f0d
nixos/slurm: set slurmd KillMode to process
...
The default of systemd is to kill the
the whole cgroup of a service. For slurmd
this means that all running jobs get killed
as well whenever the configuration is updated (and activated).
To avoid this behaviour we set "KillMode=process"
to kill only slurmd on reload. This is how
slurm configures the systemd service.
See:
https://bugs.schedmd.com/show_bug.cgi?id=2095#c24
508f866ea1
2018-11-20 22:26:42 +01:00
Samuel Dionne-Riel
a041dc8ab7
Merge pull request #50499 from delroth/syncthing-relay
...
syncthing-relay module: init
2018-11-20 01:40:23 +00:00
Richard Marko
3ffda36356
wireguard: don't modprobe if boot.isContainer is set
2018-11-20 01:17:04 +01:00
Linus Heckemann
388d36951c
Merge pull request #49735 from pvgoran/mysql-support-mysql57
...
nixos/mysql: support package=mysql57
2018-11-19 20:49:08 +01:00
Ben Blaxill
551d2f7ed2
nixos/firewall: Always use global firewall.allowed rules
...
Apply global firewall.allowed* rules separately from the
interface specific rules.
2018-11-18 22:50:01 -05:00
Pierre Bourdon
08f24cadaa
syncthing-relay module: init
2018-11-19 01:09:54 +01:00
Renaud
7f84561cc3
Merge pull request #49631 from janikrabe/master
...
oidentd: 2.2.2 -> 2.3.1
2018-11-19 00:31:02 +01:00
Benno Fünfstück
773e8d07bc
nixos/accountsservice: set XDG_DATA_DIRS correctly
2018-11-18 17:16:24 +01:00
Pavel Goran
21e9c35f5f
nixos/mysql: support package=mysql57
2018-11-18 12:25:36 +07:00
Jörg Thalheim
31d2593ced
netdata: fix python plugins
...
fixes #33366
2018-11-17 15:38:15 +00:00
Jörg Thalheim
dfd77bc26f
Merge pull request #50459 from marsam/feature/netdata-darwin
...
netdata: 1.10.0 -> 1.11.0
2018-11-17 15:01:06 +00:00
Jörg Thalheim
a91a1eede5
Merge pull request #50495 from zimbatm/nixos-move-autoupgrade
...
nixos: move system.autoUpgrade
2018-11-17 13:08:27 +00:00
zimbatm
7b9a553e21
nixos: move system.autoUpgrade
...
This is not installer-specific
2018-11-17 14:05:30 +01:00
Vladimír Čunát
80738ed9dc
nixos gtk.iconCache.enable: default from xserver.enable
...
It's a quick approximation to unblock unstable channels after #48116 .
This commit isn't ideal, as I suspect most wayland users won't have
xserver.enable, so they will lose the icon cache in case they had gtk
in system path (otherwise they didn't get cache anyway).
I considered using environment.noXlibs, but the nixos tests installing
headless systems do *not* get that option, so we would still be pulling
gtk in many cases where it's clearly not desired. We need to design
this more carefully.
2018-11-17 11:18:10 +01:00
Silvan Mosberger
5c4ed80ad7
Merge pull request #49835 from Synthetica9/fix-49826
...
nixos-generate-config: fix for swapless kernels
2018-11-17 02:53:43 +01:00
Johannes Frankenau
eea86c9e71
nixos/fontconfig: fix enable option of penultimate
2018-11-16 21:33:53 +01:00
Samuel Dionne-Riel
07eaaf6c8b
Merge pull request #49838 from dasJ/mysql-datadir
...
nixos/mysql: Explicitly set datadir in my.cnf
2018-11-16 19:21:01 +00:00
Jörg Thalheim
348b7b8be9
nixos/netdata: own plugins must the looked up first
...
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
2018-11-16 11:24:27 -05:00
Eelco Dolstra
304e14a198
Merge pull request #48588 from zimbatm/shared-codename
...
group the release info
2018-11-16 13:10:54 +01:00
Rob Vermaas
02b60418b1
Update GCE image for 18.09
...
(cherry picked from commit e0eb712136aa8cd786955e9109afbbf8ba42555c)
2018-11-16 11:43:42 +01:00
Eelco Dolstra
5835b2796e
Merge pull request #50440 from Mic92/nix-cores
...
nixos/nix-daemon: default to build with all cores available
2018-11-16 09:13:44 +01:00
Jörg Thalheim
ced57f7888
nixos/nix-daemon: default to build with all cores available
...
These days build systems are more robust w.r.t. to concurrency.
Most users will have at least two cores in their machines.
Therefore I suggest to increase the number of cores used for building.
fixes #50376
2018-11-16 02:05:30 +00:00
Ryan Mulligan
23dfa4e073
nixos/mysql: fix ensureUsers example formatting
...
closes #50441
2018-11-15 17:46:09 -08:00
zimbatm
2a838cb6d7
group the release info
...
this makes the codename globally accessible in the repo. The release is
not only for NixOS anymore.
2018-11-15 21:56:17 +01:00
Rafael García Gallego
8bf4fe85f1
selfoss (service): fix port in service config ( #50411 )
2018-11-15 19:22:20 +00:00
Nadrieril
99a8c45bdd
nixos/ckb: Add option to restrict access to the devices to a particular group
...
fixes #34064
2018-11-15 16:49:38 +00:00
Léo Gaspard
0483ce0eee
rss2email module: init
...
Also adding `system-sendmail` package for sharing the code with other
modules or packages needing it.
2018-11-15 23:44:16 +09:00
Silvan Mosberger
428eef67fd
Merge pull request #50393 from tazjin/fix/journaldriver-module-import
...
nixos/journaldriver: import module in top-level module list
2018-11-15 12:52:12 +01:00
Linus Heckemann
f73afe6ccf
Merge pull request #50356 from mayflower/gitlab-smtp-fix
...
gitlab: fix smtp setting
2018-11-15 12:13:18 +01:00
Vincent Ambo
d5ea09758d
nixos/journaldriver: import module in top-level module list
...
Imports the `journaldriver` module into the top-level NixOS module
list to make it usable without extra work.
This went unnoticed in #42134 (mostly because my setup imports modules
explicitly from pinned versions).
Fixes #50390
2018-11-15 11:02:55 +01:00
Jörg Thalheim
0a8063442c
Merge pull request #50361 from Mic92/node-packages-springclean
...
nodePackages: springclean
2018-11-14 21:18:44 +00:00
Vladimír Čunát
e229065842
Merge #50280 : xorg: init xf86-video-vboxvideo ...
...
Based on reports X wouldn't start out of the box and seems OK now.
In case there are still some problems, we can improve later.
I checked that nixos.tests.virtualbox.* still succeed.
2018-11-14 20:34:48 +01:00
Jörg Thalheim
552c223625
nodePackages.statsd: remove
...
The package/service is broken. Upstream is dead
2018-11-14 18:32:44 +00:00
Robin Gloster
74df0823f3
gitlab: fix smtp setting
...
fixes #50163
2018-11-14 18:58:45 +01:00
Daniel Peebles
9b7c57cdc8
Merge pull request #50348 from DzmitrySudnik/exhibitor-service-fix
...
exhibitor: fix paths for zookeeper shell scripts
2018-11-14 09:32:14 -05:00
Dzmitry Sudnik
5517661935
exhibitor: fix paths for zookeeper shell scripts to point to local folders
2018-11-14 09:30:01 -05:00
Linus Heckemann
231e671758
Merge pull request #49736 from nh2/glusterfs-service-simple-unit-no-forking
...
glusterfs service: Switch to simple unit instead of forking
2018-11-14 12:35:57 +01:00
Ding Xiang Fei
ceececbd04
Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo
2018-11-14 12:32:28 +08:00
Samuel Dionne-Riel
58c0c2574c
Merge pull request #49840 from markuskowa/fix-pgBackup
...
nixos/postgresqlBackup: set to umask to 0077
2018-11-14 01:40:38 +00:00
Silvan Mosberger
9c7f44e18b
Merge pull request #50321 from florianjacob/systemd-resolved
...
nixos/systemd-resolved: link networkd resolv.conf to dynamic stub resolver
2018-11-13 23:42:54 +01:00
Tobias Happ
4839403dd6
nixos/{lightdm,sddm,xpra}: remove enabling of logToFile
2018-11-13 21:52:37 +01:00
Florian Jacob
e80cdb2bac
nixos/systemd-resolved: link resolv.conf to dynamic stub resolver
...
version as recommended by upstream (since systemd 236):
https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
2018-11-13 19:21:02 +01:00
Jörg Thalheim
e3ac65f4c1
Merge pull request #50186 from dingxiangfei2009/cloud-init-btrfs
...
Allow cloud-init to support creating btrfs partitions
2018-11-13 14:17:30 +00:00
Jörg Thalheim
a5c74762cb
nixos/cloud-init: add enable suffix to ext4/btrfs
...
Makes the optional more self-describing and allows future extensions
2018-11-13 10:28:40 +00:00
Robert Hensing
9871fe3564
Merge pull request #47346 from NixOS/roberth-patch-1
...
rabbitmq module: Update documentation
2018-11-13 10:03:38 +01:00
Robert Hensing
dd3aca2d0b
Merge pull request #49256 from roberth/nixos-nixpkgs-pkgs-use-overlays
...
NixOS: use overlays when nixpkgs.pkgs is set
2018-11-13 09:55:24 +01:00
Ding Xiang Fei
a965921af9
allow cloud-init to support creating btrfs partitions
2018-11-13 13:14:34 +08:00
Matthew Bauer
964d01a5ca
Merge pull request #48116 from romildo/fix.xdg-icons
...
gtk/icons: (re)build icon theme caches
2018-11-12 16:25:52 -06:00
José Romildo Malaquias
39a9b865b5
gtk: new service giving support to GTK+ applications
2018-11-12 19:55:30 -02:00
Vladimír Čunát
9108b24253
xorg: init xf86-video-vboxvideo at 1.0.0
...
... and switch to it by default in virtualbox guests
2018-11-12 20:29:14 +01:00
Léo Gaspard
27a5427526
nixos-build-vms: fix syntax error
...
Introduced by 6c68fbd4e1
2018-11-13 00:40:07 +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
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
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
Elis Hirwing
a1f23bf1c8
nixos/dmrconfig: Add module to enable udev rules
2018-11-08 08:37:44 +01:00
Janik Rabe
49e97f8f88
oidentd: 2.2.2 -> 2.3.1
...
* Added license: GPLv2.
* Updated homepage and description.
* CFLAGS are no longer necessary as of version 2.2.0.
* Option '-a ::' is no longer necessary as of version 2.2.0.
2018-11-07 14:51:45 +02:00
Ding Xiang Fei
4259f7575e
use closure-info for building system tarball
2018-11-07 12:52:53 +08: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
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
20078fd5b2
nixos/rngd: do not pass --version flag
2018-11-05 10:41:38 +01: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
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
