Aaron Andersen
8d7dc105b1
Merge pull request #63931 from aanderse/phpfpm
...
phpfpm: revert #63156
2019-07-03 07:04:17 -04:00
Aaron Andersen
9f2518da59
Merge pull request #64199 from thorstenweber83/fix-mysql-test
...
nixos/mysql: fix mysql test after #63862
2019-07-03 06:27:40 -04:00
Aaron Andersen
ec80ffc621
Merge pull request #62061 from aanderse/nagios
...
nixos/nagios: module updates
2019-07-03 06:19:35 -04:00
talyz
732af03ace
networkmanager: Documentation cleanup.
...
- Refer to external documentation for dns option
- Clean up macAddress option
- Improve references
2019-07-03 09:40:05 +00:00
talyz
80acb28bee
networkmanager: Add rc-manager option
...
Add an option to set the rc-manager parameter in NetworkManager.conf,
which controls how NetworkManager handles resolv.conf. This sets the
default rc-manager to "resolvconf", which solves #61490 . It
additionally allows the user to change rc-manager without interference
from configuration activations.
2019-07-03 09:40:05 +00:00
Frederik Rietdijk
25a77b7210
Merge staging-next into staging
2019-07-03 08:59:42 +02:00
Thorsten Weber
46ea3ebc19
nixos/mysql: make ExecStartPost script fail on error
2019-07-03 08:50:21 +02:00
Peter Hoeg
897834f015
nixos/nix-optimise: be smarter about when we run the store optimiser
...
We might be inside a NixOS container on a non-NixOS host, so instead of not
running at all inside a container, check if the nix-daemon socket is writable as
it will tell us if the store is managed from here or outside.
Fixes #63578
2019-07-03 09:37:14 +08:00
David Wood
16c394fe0f
nixos/deluge: Add extractor dependencies.
...
This commit adds the "Extractor" plugin dependencies to the PATH of the
`deluged` service.
2019-07-02 22:26:38 +01:00
David Wood
9837facf21
nixos/deluge: user, group and web firewall opts.
...
This commit adds new options to the Deluge service:
- Allow configuration of the user/group which runs the deluged daemon.
- Allow configuration of the user/group which runs the deluge web
daemon.
- Allow opening firewall for the deluge web daemon.
2019-07-02 22:26:34 +01:00
Tadeo Kondrak
fef4dc526f
nixos/programs/shell.nix: don't use unnecessary GNU-specific option
2019-07-02 03:08:14 -06:00
Peter Hoeg
10dd03e0a3
Merge pull request #63551 from Steell/roon-server
...
roon-server: init at 100600401
2019-07-02 10:06:29 +08:00
Aaron Andersen
f2a499549f
nixos/httpd: drop mercurial httpd subservice
2019-07-01 15:34:00 -04:00
Casey Ransom
35d58c3421
datadog-agent: fix extraIntegrations
...
The override that builds the custom python for integrations-core was
overriding python, but pythonPackages was still being inherited from a
call to `datadog-integrations-core {}`, causing
service.datadog-agent.extraIntegrations to be ignored.
2019-07-01 11:45:19 -04:00
David Wood
6ba90c2aae
nixos/lidarr: add user/group/openFirewall opts.
...
This commit adds new configuration options to the Lidarr module that
allows configuration of the user and group that Lidarr runs as; and to
open the firewall for the Lidarr port.
2019-07-01 16:17:18 +01:00
worldofpeace
3f4a353737
treewide: use dontUnpack
2019-07-01 04:23:51 -04:00
worldofpeace
cab7c6cbd9
treewide: use dontConfigure
2019-07-01 04:23:51 -04:00
Aaron Vodney
cc83a0d081
u9fs service: start after network.target
2019-06-30 22:43:08 -04:00
Aaron Andersen
d0a147e841
nixos/mysql: run ExecStartPost as root (again) to preserve compatibility with installs that have been secured
2019-06-30 21:59:47 -04:00
Aaron Andersen
e0590da813
nixos/mysql: turn ExecStartPost into a shell script and simplify code
2019-06-30 21:58:27 -04:00
Aaron Andersen
26a5f32096
nixos/redmine: cosmetic cleanup
2019-06-30 07:24:23 -04:00
Aaron Andersen
e702468f6b
nixos/redmine: add database.createLocally option
2019-06-30 07:24:18 -04:00
Aaron Andersen
278d867a9b
Revert "Merge pull request #63156 from Izorkin/phpfpm-rootless"
...
This reverts commit b5478fd1a2ef442a54c36031bf3a27a96b5ea31c, reversing
changes made to dbb00bfcbfb291e79d4d2d512041656e6bcfcd9a.
2019-06-28 21:47:43 -04:00
Aaron Andersen
4b98e262a0
Revert "nixos/phpfpm: Remove usage of undefined variable fpmCfg"
...
This reverts commit 54645ce43a1cd2ecde5f1b6d035366b0311117cf.
2019-06-28 21:47:17 -04:00
Ambroz Bizjak
c07fb9cebd
nixos/opengl: Don't set XDG_DATA_DIRS.
...
This was added in #19936 so that vulkan-loader finds the ICD config files. It is
not needed any more after #62869 where it was ensured that the loader looks in
/run/opengl-driver(-32)/share.
2019-06-28 14:36:29 +02:00
worldofpeace
8789ff3179
Merge pull request #63822 from worldofpeace/dde-control-center/init
...
deepin.dde-control-center: init at 4.10.11
2019-06-27 22:15:52 -04:00
worldofpeace
8c2bcb181e
nixos/deepin: add dde-control-center
2019-06-27 22:15:13 -04:00
Elis Hirwing
54645ce43a
nixos/phpfpm: Remove usage of undefined variable fpmCfg
2019-06-27 20:39:18 +02:00
Elis Hirwing
b5478fd1a2
Merge pull request #63156 from Izorkin/phpfpm-rootless
...
phpfpm: do not run anything as root
2019-06-27 19:13:53 +02:00
Elis Hirwing
dbb00bfcbf
Merge pull request #63726 from davidtwco/lidarr/specify-package
...
nixos/lidarr: allow specifying package
2019-06-27 19:06:51 +02:00
Aaron Andersen
fa01a229e7
Merge pull request #63101 from dasJ/gitea-jwt
...
nixos/gitea: Generate a JWT secret for git LFS
2019-06-27 13:06:17 -04:00
Aaron Andersen
ae02678a9d
Merge pull request #63786 from aanderse/mysql
...
mysql: drop support for deprecated package & module option
2019-06-27 12:14:35 -04:00
Domen Kožar
2072043efb
duplicati: fix StateDirectory
2019-06-27 14:15:37 +02:00
Peter Hoeg
67cca52fd9
Merge pull request #53204 from peterhoeg/m/libvirt
...
libvirt: support proper networking in user session
2019-06-27 11:39:48 +08:00
Janne Heß
8c3dd6f5e7
nixos/gitea: Generate a JWT secret for git LFS
2019-06-27 03:29:02 +02:00
Aaron Andersen
616e52e21b
Merge pull request #63622 from aanderse/zoneminder
...
nixos/zoneminder: fix some issues with database.createLocally option
2019-06-26 20:36:26 -04:00
Daniel Schaefer
19851ec1fc
nixos/zoneminder: Fix nginx config check
...
NixOS wouldn't build because the nginx config checker fails.
Location without a trailing slash "could allow an attacker to read file
stored outside the target folder.", source:
https://github.com/yandex/gixy/blob/master/docs/en/plugins/aliastraversal.md
Shouldn't change the behaviour according to
https://serverfault.com/questions/607615/using-trailing-slashes-in-nginx-configuration/607731#607731
2019-06-26 20:45:55 +02:00
pacien
b05870d223
nixos/cgit: fix config example
...
The order of the keys matters: scan-path must be the last key for other settings
to be taken into account.
2019-06-26 19:59:31 +02:00
Eelco Dolstra
8e620e1bc5
Merge pull request #63810 from NixOS/binaryCaches-default
...
nix.binaryCaches: always set https://cache.nixos.org
2019-06-26 18:51:17 +02:00
Domen Kožar
f572d4eb91
duplicati: PermissionsStartOnly is deprecated
2019-06-26 15:52:00 +02:00
Domen Kožar
036728f3f4
nix.binaryCaches: always set https://cache.nixos.org
...
There are many support questions when people add a new binary cache
and they suddenly lose nixos substitutions.
Most of the users want to keep that, so we're doing a breaking change.
Previously to disable all binary caches one had to do:
nix.binaryCache = [];
Now the same is possible via:
nix.binaryCache = lib.mkForce;
2019-06-26 14:30:56 +02:00
Frederik Rietdijk
d843e16cb8
Merge master into staging-next
2019-06-26 13:22:30 +02:00
José Romildo Malaquias
b86c7b8568
nixos/deepin: add dde-launcher usb service
2019-06-26 00:40:17 -03:00
Samuel Dionne-Riel
6fba2c3565
sd-image-raspberrypi: populateBoot -> populateFirmware
...
Fixes an incomplete change from the last changes.
2019-06-25 20:49:34 -04:00
Graham Christensen
7b8a7cee78
Merge pull request #63699 from NinjaTrappeur/nin-hostapd-noscan
...
hostapd: add noscan mode
2019-06-25 18:08:58 -04:00
Graham Christensen
38c28ef10c
Merge pull request #56265 from aanderse/permissions-start-only
...
replace deprecated usage of PermissionsStartOnly (part 2)
2019-06-25 18:04:22 -04:00
Aaron Andersen
fb918a9254
nixos/mysql: drop rootPassword option
2019-06-25 17:26:53 -04:00
Aaron Andersen
74ff20fae7
nixos/zoneminder: fix some issues with database.createLocally option
2019-06-25 12:20:22 -04:00
Jan Tojnar
07d1d3ed68
Merge branch 'master' into staging
2019-06-25 18:06:43 +02:00
Frederik Rietdijk
4589a04299
Merge master into staging-next
2019-06-25 16:26:29 +02:00