Commit Graph

15791 Commits

Author SHA1 Message Date
markuskowa
2913973aa7
Merge pull request #76938 from lourkeur/fix_76184_gnunet
nixos/gnunet: Add types to the options
2020-01-09 21:33:50 +01:00
markuskowa
59670b0c56
Merge pull request #76939 from lourkeur/fix_76184_tsocks
nixos/tsocks: Add types to the options
2020-01-09 21:33:18 +01:00
Florian Klink
2603d15a4d
Merge pull request #77167 from srhb/ceph-14_2_5
ceph: 14.2.4 -> 14.2.5
2020-01-09 18:39:05 +01:00
Silvan Mosberger
e9c16ec186
Merge pull request #76857 from Infinisil/recursive-disableModules
Apply `disabledModules` recursively
2020-01-09 18:20:12 +01:00
Silvan Mosberger
a6462a4a8b
nixos/doc: Extend disabledModules docs to indicate recursive disabling 2020-01-09 17:26:08 +01:00
Silvan Mosberger
7167985e34
nixos/documentation: Fix disabledModules being rendered
Previously disabledModules would not be disabled for the manual
2020-01-09 17:26:08 +01:00
Florian Klink
5a523d70f6
Merge pull request #77158 from aanderse/mysql
nixos/mysql: restart systemd service on abort
2020-01-09 17:04:40 +01:00
Silvan Mosberger
9d4b59b549
nixos/doc: Add incompatibility note for either submodule path
Co-Authored-By: Robert Hensing <roberth@users.noreply.github.com>
2020-01-09 16:47:53 +01:00
Denys Pavlov
90b6823373 nixos/powertop: wait for hardware to initialize
We should wait until after `multi-user.target` is triggered to allow
hardware to finish initializing, such as network devices and USB drives.
This ensures `powertop --auto-tune` sets more tunables to "Good".

Fixes #66820
2020-01-09 19:45:41 +08:00
Jörg Thalheim
5121edc703
home-assistant: 0.100.3 -> 0.103.2 (#76088)
home-assistant: 0.100.3 -> 0.103.2
2020-01-09 11:29:04 +00:00
Florian Klink
959034d8e9
Merge pull request #77355 from andersk/gdm-tmpfiles
nixos/gdm: Fix tmpfiles configuration syntax
2020-01-09 12:12:57 +01:00
Oleksii Filonenko
25b75b8fb5
nixosTests.home-assistant: port to python 2020-01-09 10:39:50 +00:00
Jörg Thalheim
283e3e7218
nixos/home-assistant: support for secrets 2020-01-09 10:39:50 +00:00
Jörg Thalheim
ff5ddd04f3
nixos/pam: cleanup services (#76885)
nixos/pam: cleanup services
2020-01-09 10:09:13 +00:00
Sarah Brofeldt
59233d67b1 nixos/tests/ceph: Use 3 osds, the default minimum 2020-01-09 08:00:19 +01:00
Anders Kaseorg
07ccbc099a nixos/gdm: Fix tmpfiles configuration syntax
Fixes this error from `nixos-rebuild switch` introduced by #75893:

setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-08 19:51:32 -08:00
Léo Gaspard
b31660e5bb
Merge branch 'master' into ihatemoney 2020-01-09 03:49:03 +01:00
Silvan Mosberger
6525da6321
lib/types: Allow paths as submodule values 2020-01-08 23:54:45 +01:00
Silvan Mosberger
228a7b173e
nixos/certmgr: Flip either submodule path type
For upcoming allowance of paths as submodules
2020-01-08 23:54:45 +01:00
Pascal Bach
0319241132 nixos/mxisd: fix empty user name 2020-01-08 23:18:26 +01:00
Pascal Bach
76506ae42f nixos/matrix-synapse: fix empty user name 2020-01-08 23:18:26 +01:00
Aaron Andersen
336a6f471f nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command 2020-01-08 10:37:46 -05:00
worldofpeace
79de730e77 nixos/buildbot: fix eval
Fixes https://github.com/NixOS/nixpkgs/issues/77309
2020-01-08 10:06:08 -05:00
worldofpeace
a408bcbe44
Merge pull request #73938 from worldofpeace/port-gnome3-xorg-test
nixosTests.gnome3-xorg: port to python/rewrite
2020-01-08 09:38:29 -05:00
Jacek Galowicz
f7b274d957 nixosTests.kafka: port to python 2020-01-08 10:51:57 +01:00
Jacek Galowicz
8ecd07f9e3 nixosTests.elk: port to python 2020-01-08 10:51:57 +01:00
worldofpeace
1c2e27e4d5 nixos/systemd-lib: don't fail on systemd.packages duplicates
In some cases like we've noticed in https://github.com/NixOS/nixpkgs/issues/76169,
having duplicate packages in systemd.packages like
```
systemd.packages = [ gnome-shell gnome-shell gnome-session ];
```
breaks.

Here we use an associative array to ensure no
duplicate paths when we symlink all the units listed
in systemd.packages.
2020-01-07 21:42:14 -05:00
Silvan Mosberger
32104e7c77
nixos/doc: document the loaOf type deprecation (#77109)
nixos/doc: document the loaOf type deprecation
2020-01-08 03:25:51 +01:00
rnhmjoj
fa3919de5f
nixos/doc: document the loaOf type deprecation 2020-01-08 00:47:59 +01:00
Malte Brandy
c1d7850f85
Improve documentation for stateVersion
The meaning of stateVersion often leads to a lot of confusion. This
commit trys to improve that situation.
2020-01-07 22:27:03 +01:00
Jacek Galowicz
c44331dd5d nixosTests.initdb: port to python 2020-01-07 20:52:24 +01:00
Rickard Nilsson
6edbe844b2 nixos/tests/chromium: Fix nixos-hex.svg hash 2020-01-07 19:42:52 +01:00
Milan Pässler
2a31a6a412 tree-wide: fix errors and warning related to loaOf deprecation 2020-01-07 06:23:28 +01:00
Aaron Andersen
df059f89e6 nixos/mysql: restart systemd service on abort 2020-01-06 20:08:51 -05:00
Silvan Mosberger
ff16d17b42
nixos/systemd: Explicitly put default path packages after othe… (#77088)
nixos/systemd: Explicitly put default path packages after others
2020-01-06 21:51:04 +01:00
worldofpeace
c496b1b102
Merge pull request #63103 from rnhmjoj/loaof
Deprecate types.loaOf [WIP]
2020-01-06 11:00:17 -05:00
WilliButz
482b39a7e5
nixos/oxidized: add missing slash to PIDFile path 2020-01-06 16:58:54 +01:00
rnhmjoj
1d61efb7f1 treewide: use attrs instead of list for types.loaOf options 2020-01-06 10:39:18 -05:00
Silvan Mosberger
9327e1c6ba
nixos/systemd: Explicitly put default path packages after others
This fixes the dhcpcd issue in https://github.com/NixOS/nixpkgs/issues/76969,
which was exposed by https://github.com/NixOS/nixpkgs/pull/75031
introducing changes in the module ordering and therefore option ordering
too.

The dhcpcd issue would also be fixable by explicitly putting
dhcpcd's paths before others, however it makes more sense for systemd's
default paths to be after all others by default, since they should only
be a fallback, which is how binary finding will work if they come after.
2020-01-06 15:58:06 +01:00
worldofpeace
00c813a636
Merge pull request #75893 from worldofpeace/gdm-tmpfiles
nixos/gdm: use systemd tmpfiles instead of preStart
2020-01-06 09:51:59 -05:00
Jan Tojnar
04a71194a8
Merge pull request #76683 from wakira/nixos/ibus
nixos/ibus: fix missing dconf profile
2020-01-06 12:59:00 +01:00
Sheng Wang
c71339fbe5 nixos/ibus: fix missing dconf profile
Fix ibus user preferences not being saved. ibus-daemon was falling back on null configuration due to missing "ibus" dconf profile.
2020-01-06 20:30:37 +09:00
Robert Hensing
e1ce60ae7a
Merge pull request #76947 from juliancoffee/master
Fix example for xkbOptions
2020-01-05 23:35:27 +01:00
Robert Hensing
933003e684
Merge pull request #73394 from pasqui23/xkbopt
nixos/xserver:services.xserver.xkbOptions is now commas
2020-01-05 23:34:59 +01:00
Eelco Dolstra
3b15451291
nix: 2.3.1 -> 2.3.2 2020-01-05 20:35:43 +01:00
Symphorien Gibol
665fee312a nixos/tests/ihatemoney.nix: run nixpkgs-fmt
now indentation is perfect
2020-01-05 12:00:00 +00:00
symphorien
b8b9e7be6d
Update nixos/tests/ihatemoney.nix
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
2020-01-05 22:04:42 +00:00
symphorien
54b0ab0ac6
Update nixos/tests/ihatemoney.nix
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
2020-01-05 22:04:32 +00:00
Louis Bettens
caa9ce1caa nixos/tsocks: Add types to the options 2020-01-05 00:15:26 +01:00
Louis Bettens
d49737836a nixos/gnunet: Add types to the options 2020-01-05 00:07:50 +01:00
Danylo Hlynskyi
cef68c4580
nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch with reload enabled (#76179)
nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch
with reload enabled

Closes https://github.com/NixOS/nixpkgs/issues/73455
2020-01-05 00:39:23 +02:00
Illia Denysenko
73b38ff7c5
Fix example for xkbOptions
###### Motivation for this change
With space between two options, multiple options just don't work
Looks like xkbOptions then used for generation of xorg.conf.d/00-keyboard.conf.
kbd's man says XkbOptions must be comma-separated without spaces.
https://linux.die.net/man/4/kbd

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
- Built on platform(s)
   - [ ] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Ensured that relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers

cc @
2020-01-04 20:54:19 +02:00
Jörg Thalheim
9458ec4115
pam: remove unused ftp service
vsftpd is the only ftp server module and defines its own pam service.
2020-01-03 15:24:36 +00:00
Jörg Thalheim
2591fc7ede
pam: remove cups service
The cups module itself already defines this.
2020-01-03 15:24:34 +00:00
Jörg Thalheim
900aaa5a98
screen: move pam service to module 2020-01-03 15:24:32 +00:00
adisbladis
c4f6aff9dd
nixos/doc: Fix manual build after renaming compton to picom 2020-01-03 13:09:40 +00:00
Maximilian Bosch
a90452b2c9
Merge pull request #76871 from laikq/master
nixos-install: add documentation for --channel, --no-channel-copy
2020-01-03 13:56:01 +01:00
adisbladis
aec68f4e7e
nixos/compton: Rename module to picom
With a backwards compatibility alias
2020-01-03 12:52:02 +00:00
Gwendolyn Quasebarth
6dca2312ce nixos-install: add documentation for --channel, --no-channel-copy 2020-01-03 11:33:22 +01:00
Frederik Rietdijk
7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
Silvan Mosberger
c7ade6844f
Revert "lib/types: Allow paths as submodule values"
This reverts commit eec83d41e3.

This broke hydra evaluation because with this commit submodule values
are allowed to be paths, however the certmgr module uses `either
(submodule ...) path` in its type, meaning it already used paths for
something else which would now be interpreted as a submodule.
2020-01-03 05:21:01 +01:00
Bernardo Meurer
d80570f3f5
rogue: boot.extraTTYs -> console.extraTTYs 2020-01-02 16:59:43 -08:00
Bernardo Meurer
992245f844
nixos-manual: boot.extraTTYs -> console.extraTTYs 2020-01-02 16:53:15 -08:00
aszlig
845e92835d
Merge Last-Modified fix for nginx (#76697)
This fixes the patch for nginx to clear the Last-Modified header if a
static file is served from the Nix store.

So far we only used the ETag from the store path, but if the
Last-Modified header is always set to "Thu, 01 Jan 1970 00:00:01 GMT",
Firefox and Chrome/Chromium seem to ignore the ETag and simply use the
cached content instead of revalidating.

Alongside the fix, this also adds a dedicated NixOS VM test, which uses
WebDriver and Firefox to check whether the content is actually served
from the browser's cache and to have a more real-world test case.
2020-01-02 21:41:59 +01:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Christian Kauhaus
129c73802f
Merge pull request #76153 from arcnmx/connman-iwd
nixos/connman: optional iwd backend
2020-01-02 21:35:54 +01:00
Florian Klink
03212a7f03
Merge pull request #76606 from flokli/mysql-tests
nixosTests.mysql: add more tests
2020-01-02 21:30:55 +01:00
Matthew Bauer
81daa1e5dc
Merge pull request #76546 from matthewbauer/nvidia-fix-udev-rules
nvidia: fix $ substitution in udev rules
2020-01-02 15:04:33 -05:00
Silvan Mosberger
cdf79db19d
Module system improvements for NixOS as a submodule (#75031)
Module system improvements for NixOS as a submodule
2020-01-02 20:38:45 +01:00
Marek Mahut
7d90e34e9f
Merge pull request #76817 from misuzu/3proxy-test-python
nixosTests.3proxy: port test to python
2020-01-02 18:19:43 +01:00
Aaron Andersen
ebf58a3404
Merge pull request #76709 from aanderse/httpd-ssl
nixos/httpd: update default ssl protocols
2020-01-02 11:28:25 -05:00
misuzu
9980eb8734 nixosTests.3proxy: port test to python 2020-01-02 14:25:20 +02:00
Silvan Mosberger
eec83d41e3
lib/types: Allow paths as submodule values 2020-01-02 09:59:35 +01:00
Silvan Mosberger
bc42515736
nixos/syncthing: Fix submodule name usage
Module arguments should be taken from the arguments directly. This
allows evalModule's specialArgs to override them if necessary
2020-01-02 09:59:35 +01:00
Silvan Mosberger
90c82bfee7
nixos/docs: Add docs for types.submoduleWith 2020-01-02 09:59:32 +01:00
Atemu
a461f3fa9c Consider the exit status of docker run in ExecStop (#76444)
We don't need to stop the container if it already exited sucessfully
2020-01-01 18:28:46 -05:00
Florian Klink
2393fa23f2
Merge pull request #76560 from nh2/kexec-test-python
nixosTests.kexec: port to python and mark as broken
2020-01-01 19:05:09 +01:00
Tim J. Baumann
36b98fdf26 networkmanager: fix dispatcherScripts example
Before, the example script didn't actually exit when the event type
didn't match "up".
2020-01-01 15:32:15 +01:00
Jörg Thalheim
a82f07cecf
netdata: 1.18.1 -> 1.19.0 (#75173)
netdata: 1.18.1 -> 1.19.0
2020-01-01 12:52:29 +00:00
zimbatm
5f5df51bf0
Merge pull request #76758 from alyssais/ruby_2_7
Some Ruby 2.7 updates and fixes
2020-01-01 11:29:44 +00:00
Silvan Mosberger
fd7a019c70
nixosTests.haka: port to python (#76707)
nixosTests.haka: port to python
2020-01-01 03:31:11 +01:00
zimbatm
ab64518d0f
nixos/redmine: update example to more recent Ruby 2020-01-01 00:27:14 +00:00
Frederik Rietdijk
555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
Jörg Thalheim
a45447a3d5
bandwhich: init at 0.6.0 (#76689)
bandwhich: init at 0.6.0
2019-12-31 14:23:19 +00:00
Jakub Sokołowski
3238beab0a nixos/transmission: fix from where service loads config
Currently if you specify home to be someplace else than ~/ for user
then Transmissions always attempts to load the config from the
default location which is $HOME/.config/transmission-daemon based on documentation:
https://github.com/transmission/transmission/wiki/Configuration-Files

Which means that the changes done to the config under settingsDir in
ExecPreStart have no effect because they are modifying a file that is never loaded.

I've added an explicit --config-dir ${settingsDir} to make sure
that Transmission loads the correct config file even when home is changed.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-12-31 15:21:29 +01:00
Florian Klink
d6bbe6c0f5
Merge pull request #76719 from flokli/containers-poweroff
nixos/containers: use machinectl poweroff
2019-12-31 14:41:58 +01:00
Daniel Frank
6d671372b5
nextcloud module: https is important not only for proxies 2019-12-31 13:01:46 +01:00
Oleksii Filonenko
1a477dc895
bandwhich: 0.5.1 -> 0.6.0
- Rename from `what` to `bandwhich`
- Add Security for darwin
2019-12-31 10:20:07 +02:00
Jonathan Ringer
d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Florian Klink
90a3908ec3 nixos/containers: use machinectl poweroff
Previously, we were storing the leader pid in a runtime file and
signalled SIGRTMIN+4 manually.

In systemd 219, the `machinectl poweroff` command was introduced, which
does that for us.
2019-12-30 22:28:53 +01:00
Aaron Andersen
66bf75415f
Merge pull request #76551 from symphorien/nagios2
nagios: various improvements
2019-12-30 14:21:03 -05:00
Matthew Bauer
b43479d49f nixos/nvidia: add nvidia-uvm-tools device
Related to https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-390/+bug/1767777
2019-12-30 13:15:10 -05:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Ryan Mulligan
3a644e30b9
Merge pull request #46131 from ju1m/shorewall
shorewall: init at 5.2.3.3
2019-12-30 10:04:31 -08:00
Julien Moutinho
56a73dfb35 shorewall: init at 5.2.3.3
nixos/shorewall: init
2019-12-30 09:42:03 -08:00
Aaron Andersen
6777926911 nixos/httpd: update default ssl protocols 2019-12-30 11:24:11 -05:00
Aaron Andersen
7c8d98f8df nixos/sysstat: provide a type for each module option 2019-12-30 17:10:53 +01:00
Oleksii Filonenko
ab63902d1f
nixosTests.haka: port to python 2019-12-30 17:57:00 +02:00
Symphorien Gibol
cb38bf33e7 nagios: add nixos test 2019-12-30 16:41:18 +01:00
symphorien+git@xlumurb.eu
be25e45fc8 nagios: various improvements
* structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
2019-12-30 16:40:52 +01:00
aszlig
ccf55bead1
nginx: Clear Last-Modified if ETag is from store
This is what I've suspected a while ago[1]:

> Heads-up everyone: After testing this in a few production instances,
> it seems that some browsers still get cache hits for new store paths
> (and changed contents) for some reason. I highly suspect that it might
> be due to the last-modified header (as mentioned in [2]).
>
> Going to test this with last-modified disabled for a little while and
> if this is the case I think we should improve that patch by disabling
> last-modified if serving from a store path.

Much earlier[2] when I reviewed the patch, I wrote this:

> Other than that, it looks good to me.
>
> However, I'm not sure what we should do with Last-Modified header.
> From RFC 2616, section 13.3.4:
>
> - If both an entity tag and a Last-Modified value have been
>   provided by the origin server, SHOULD use both validators in
>   cache-conditional requests. This allows both HTTP/1.0 and
>   HTTP/1.1 caches to respond appropriately.
>
> I'm a bit nervous about the SHOULD here, as user agents in the wild
> could possibly just use Last-Modified and use the cached content
> instead.

Unfortunately, I didn't pursue this any further back then because
@pbogdan noted[3] the following:

> Hmm, could they (assuming they are conforming):
>
>  * If an entity tag has been provided by the origin server, MUST
>    use that entity tag in any cache-conditional request (using If-
>    Match or If-None-Match).

Since running with this patch in some deployments, I found that both
Firefox and Chrome/Chromium do NOT re-validate against the ETag if the
Last-Modified header is still the same.

So I wrote a small NixOS VM test with Geckodriver to have a test case
which is closer to the real world and I indeed was able to reproduce
this.

Whether this is actually a bug in Chrome or Firefox is an entirely
different issue and even IF it is the fault of the browsers and it is
fixed at some point, we'd still need to handle this for older browser
versions.

Apart from clearing the header, I also recreated the patch by using a
plain "git diff" with a small description on top. This should make it
easier for future authors to work on that patch.

[1]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-495072764
[2]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451644084
[3]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451646135

Signed-off-by: aszlig <aszlig@nix.build>
2019-12-30 14:30:36 +01:00
Oleksii Filonenko
bf17262578
nixos/what: init 2019-12-30 13:59:52 +02:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Jan Tojnar
480fc1856a
Merge branch 'master' into staging-next 2019-12-30 05:22:23 +01:00
lewo
885c4cc97c
Merge pull request #76151 from Ma27/bump-hydra
hydra: 2019-08-30 -> 2019-11-13
2019-12-29 10:28:44 +01:00
Frederik Rietdijk
fb66525297 Merge master into staging-next 2019-12-29 10:19:39 +01:00
Tor Hedin Brønner
3d70d4ba0b
nixos/displayManager: fix typo in legacy sessions (#76626)
xsession gets passed `dm` `wm`, so the desktop manager would be launched
before the window manager resulting in a regular desktop manager
session.

Fixes https://github.com/NixOS/nixpkgs/issues/76625
2019-12-29 02:02:24 +01:00
Jan Tojnar
332cfab4ce
Merge pull request #76591 from lourkeur/set_XKB_CONFIG_ROOT
Fix services.xserver.extraLayouts under GNOME 3
2019-12-28 20:34:56 +01:00
Izorkin
192df19a7c nixos/unit: fix typo 2019-12-28 22:12:45 +03:00
Robert Hensing
71358c4f1e swapDevices.<name>.device can be a swap file. 2019-12-28 20:00:50 +01:00
Florian Klink
bf7841aae1 nixosTests.mysql: add additional test{db,user}2
Test that other users are not able to access the mysql database, and
unix socket auth actually works.
2019-12-28 15:31:12 +01:00
Florian Klink
7d64f7a534 nixosTests.mysql: add missing () to start_all()
Because mysql.wait_for_unit() starts the vm as well, we didn't notice
that.
2019-12-28 15:31:12 +01:00
Louis Bettens
636dabcf80 nixos/xserver: set $XKB_CONFIG_ROOT 2019-12-28 12:34:56 +01:00
Linus Heckemann
b9bf846080
Merge pull request #76189 from Ma27/nixos-install-verbosity-level
nixos/nixos-installer: add flags for verbosity and build logs
2019-12-28 11:50:25 +01:00
Aaron Andersen
c95aef92b9 nixos/awstats: add missing description to extraConfig option (#76575) 2019-12-28 01:09:47 +02:00
Vladimír Čunát
c3d4998e41
Merge #75803: kresd service: unify listen declarations 2019-12-27 15:55:38 +01:00
Niklas Hambüchen
12e35035f6 nixosTests.kexec: port to python.
The test did not succeed for me before this commit
(the Perl test hung forever), and this translation exhibits
the same problem.
2019-12-27 01:22:35 +01:00
Matthew Bauer
6689a385d1 nvidia: fix $ substitution in udev rules
This fixes a harmless error from systemd-udevd that looks like:

  Dec 23 15:35:23 dellbook systemd-udevd[696]:
  /nix/store/iixya3ni5whybpq9zz1h7f4pyw7nhd19-udev-rules/99-local.rules:25
  Invalid value "..." for RUN (char 101: invalid substitution type),
  ignoring, but please fix it.

Using $$ fixes it using the escaping documented at https://www.freedesktop.org/software/systemd/man/udev.html.
2019-12-26 12:54:43 -05:00
Maximilian Bosch
c5c7ccf022
nixos/nginx: fix test
When using format-strings, curly brackets need to be escaped using `{{`
to avoid errors from python.

And apparently, Perl's `==` is used to compare substrings[1] which is why
the translation to `assert http_code == "304"` failed as the string
contains several headers from curl.

[1] Just check `perl <(echo 'die "alarm" if "foo\n304" == 304')`
2019-12-26 18:50:38 +01:00
Maximilian Bosch
495b0b581c
nixos/tests/nginx-sso: add subtests for each assertion 2019-12-26 17:59:25 +01:00
Robin Gloster
abbce768dc
nixosTests.nginx*: review fixes
Co-Authored-By: Florian Klink <flokli@flokli.de>
2019-12-26 17:59:25 +01:00
Robin Gloster
1c2781d39c
nixosTests.nginx*: port to python 2019-12-26 17:59:25 +01:00
Aaron Andersen
4d2dd15546
Merge pull request #73113 from aanderse/httpd-vhost
nixos/httpd: support overridable virtual hosts
2019-12-26 08:09:08 -05:00
danbst
50d6e93dc8 nixos/nginx: fixup permissions for Nginx state dir
The commit b0bbacb521 was a bit too fast
It did set executable bit for log files.

Also, it didn't account for other directories in state dir:
```
 # ls -la /var/spool/nginx/
total 32
drwxr-x--- 8 nginx nginx 4096 Dec 26 12:00 .
drwxr-xr-x 4 root  root  4096 Oct 10 20:24 ..
drwx------ 2 root  root  4096 Oct 10 20:24 client_body_temp
drwx------ 2 root  root  4096 Oct 10 20:24 fastcgi_temp
drwxr-x--- 2 nginx nginx 4096 Dec 26 12:00 logs
drwx------ 2 root  root  4096 Oct 10 20:24 proxy_temp
drwx------ 2 root  root  4096 Oct 10 20:24 scgi_temp
drwx------ 2 root  root  4096 Oct 10 20:24 uwsgi_temp
```

With proposed change, only ownership is changed for state files, and mode is left as is
except that statedir/logs is now group accessible.
2019-12-26 14:16:29 +02:00
Yurii Izorkin
b0bbacb521 nixos/nginx: recursively change logs directory owner/group (#76174)
This change brings pre-existing installations (where the logfiles
are owned by root) in line with the new permssions (where logfiles
are owned by the nginx user)
2019-12-26 13:51:10 +02:00
Jörg Thalheim
c5aacb2350
Merge pull request #76514 from Thra11/fix-udev-hwdb-description
udev: fix option description
2019-12-26 06:43:02 +00:00
Yorick van Pelt
470c8a2a36 nixos/borgbackup: install job wrappers to systemPackages for easy borg access
Currently to run borg job manually, you have to use systemctl:
```
$ systemctl start borgbackup-job-jobname.service
```

This commit makes wrappers around borg jobs available in $PATH, which have
BORG_REPO and connection args set correctly:
```
$ borg-job-jobname list
$ borg-job-jobname mount ::jobname-archive-2019-12-25T00:01:29 /mnt/some-path
$ borg-job-jobname create ::test /some/path
```

Closes: https://github.com/NixOS/nixpkgs/pull/64888
Co-authored-by: Danylo Hlynskyi <abcz2.uprola@gmail.com>
2019-12-26 07:50:03 +02:00
Maximilian Bosch
ec253e16cd
Merge pull request #76410 from nh2/mumble-test-python
nixosTests.mumble: port to python
2019-12-26 02:33:43 +01:00
Silvan Mosberger
5dc7050bd6
Merge pull request #75400 from nand0p/ethminer-v18
ethminer: 0.18.0-rc.0 -> 0.18.0
2019-12-25 23:56:24 +01:00
Tom Hall
08d31b74ec udev: fix option description
The two file paths were changed from 10-local to 99-local, but only one
of the descriptions was changed.
2019-12-25 20:51:01 +00:00
Dima
2467edf80c nixos/manual: fixing links for awstats release note (#76500)
`linkend` attribute needs to point to an option.
2019-12-25 21:06:18 +02:00
Fernando J Pando
90ee16dbfc nixos/ethminer: always restart 2019-12-25 10:33:50 -05:00
Pavol Rusnak
4899c6992c
nixos-generate-config: i18n.consoleFont has been renamed to console.font
fixes #76391
2019-12-25 15:02:58 +01:00
Jörg Thalheim
89c55c0a6d
net-snmp: split outputs (#76155)
net-snmp: split outputs
2019-12-25 06:27:55 +00:00
Aaron Andersen
79215f0df1 nixos/httpd: limit serving web content to virtual hosts, convert virtualHosts option type from listOf to attrsOf, add ACME integration 2019-12-24 20:27:48 -05:00
Aaron Andersen
08bd639a92
Merge pull request #73959 from aristaeus/awstats
nixos/awstats: refactor module
2019-12-24 18:57:00 -05:00
markuskowa
0b41391890
Merge pull request #76425 from r-ryantm/auto-update/slurm
slurm: 19.05.4.1 -> 19.05.5.1
2019-12-24 20:19:50 +01:00
Markus Kowalewski
5041e1d848
nixos/slurm: fix perl->python conversion bug 2019-12-24 19:51:18 +01:00
Ben Harper
dade94cdb9 nixos/awstats: refactor module 2019-12-24 12:20:52 -05:00
Niklas Hambüchen
c6a032ecf6 nixosTests.mumble: port to python 2019-12-24 16:10:34 +01:00
worldofpeace
48557d3c57
Merge pull request #76160 from worldofpeace/mate-settings-daemon/fixup
nixos/mate: drop g-s-d enable
2019-12-23 08:53:10 -05:00
Aaron Andersen
133a5c345c
Merge pull request #74763 from nek0/restya-board-config-fix
restya-board: Restya board config fix
2019-12-23 07:42:37 -05:00
Florian Klink
eeaf1f702d
Merge pull request #75103 from sternenseemann/spacecookie
services/spacecookie: init
2019-12-23 11:09:52 +01:00
worldofpeace
9dacdec2d9
Merge pull request #76171 from Ma27/optionally-disable-python-lint
nixos/python-test-driver: add an option to disable python linter
2019-12-23 00:17:29 -05:00
nek0
acd1240fd1 restya-board: fix configuration option and switch to file based password provisioning 2019-12-23 05:45:15 +01:00
worldofpeace
35b7b17125
Merge pull request #76116 from worldofpeace/pantheon-cleanup
Pantheon cleanups
2019-12-22 22:59:21 -05:00
Aaron Andersen
086d1ad906
Merge pull request #75047 from kampka/trilium-server
Add trilium server and module
2019-12-22 20:26:57 -05:00
Maximilian Bosch
1fc248afcc
nixos/nixos-installer: add flags for verbosity and build logs
When installing a fresh NixOS system it occasionally happens that you
encounter issues that are rather hard to track down since
`nixos-install(8)` doesn't provide any debugging flags.

This patch adds `-L` to force `nix build` to display the build-log on
stderr and `-v` to increase the log-level of Nix.
2019-12-22 22:46:58 +01:00
Maximilian Bosch
b72661749b
nixos/python-test-driver: add an option to disable python linter
While it's a good idea to automate the linting of the python code used
for our tests, I think that it can be quite distracting when hacking on
a NixOS test.

I figured that it might be more convenient to add an option as a
shortcut for this to avoid that everyone needs to dig into the test
driver again.
2019-12-22 19:27:43 +01:00
Maximilian Bosch
323c2ba6b7
Merge pull request #76139 from Ma27/systemd-nspawn-package
nixos/systemd-nspawn: use `config.systemd.package`
2019-12-22 18:50:03 +01:00