3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14722 commits

Author SHA1 Message Date
Gemini Lasswell b8cb8c39d6 nixos/yggdrasil: add service 2019-10-26 13:51:31 +02:00
Aaron Andersen 2921e8a82a
Merge pull request #71789 from tomfitzhenry/openarena-server
openarena: add module and test
2019-10-26 07:48:19 -04:00
Elias Probst 8d8c3cadd6 Fix typo in message (vswichtesvswitches) 2019-10-26 13:26:01 +02:00
Florian Klink 32fd88726b nixos/virtualbox: fix systemd-networkd-wait-online.service waiting for vboxnet0
While switching NixOS configurations with both

networking.useNetworkd = true;
virtualisation.virtualbox.host.enable;

You often end up waiting for systemd-networkd-wait-online.service.

This happens because the vboxnet0 device doesn't have a carrier until
virtualbox machines are started, so networkd gets stuck in
"Configuring":

⇒  networkctl list
IDX LINK          TYPE      OPERATIONAL SETUP
  1 lo            loopback  carrier     unmanaged
  2 wlp2s0        wlan      routable    unmanaged
  3 vboxnet0      ether     no-carrier  configuring

This updates the NixOS virtualbox host module to include a
RequiredForOnline=no statement in the generated 40-vboxnet0.network
file, so networkd doesn't consider it necessary for
systemd-networkd-wait-online.service to finish.
2019-10-26 00:45:42 +02:00
WilliButz 509fadd01a
nixos/i18n: use str instead of string for consoleKeyMap 2019-10-26 00:07:55 +02:00
Maximilian Bosch 4a5c0e029d
Merge pull request #71963 from dtzWill/security/nextcloud17-php-and-nginx-config
Address nextcloud "urgent security issue" w/nginx per upstream recs
2019-10-25 19:12:18 +02:00
Maximilian Bosch 6db4ae1f27
Merge pull request #70441 from doronbehar/package-gotify-server
gotify-server: init at 2.0.10
2019-10-25 17:10:14 +02:00
Janne Heß 2abe2b2cda nixos/stunnel: Add maintainers 2019-10-25 16:19:57 +02:00
Janne Heß 4a32dbd1e1 nixos/stunnel: Fix CA files 2019-10-25 16:19:57 +02:00
Maximilian Bosch 3461ec2ffd
nixos/gotify: init module and test 2019-10-25 16:19:41 +02:00
Tom Fitzhenry 6d90d17a96 openarena: add test 2019-10-26 00:57:54 +11:00
Tom Fitzhenry 230fc22e61 openarena: add module for dedicated server 2019-10-26 00:57:54 +11:00
Jörg Thalheim 8e0563e7e6
Merge pull request #71970 from johanot/create-gce-nitpick
scripts/gce: make image name configurable
2019-10-25 14:28:06 +01:00
Will Dietz f6c45bff6d
nixos/nextcloud: update config for "urgent security issue"
https://nextcloud.com/blog/urgent-security-issue-in-nginx-php-fpm/
2019-10-25 06:50:29 -05:00
Johan Thomsen b263e57c57 scripts/gce: make image name configurable 2019-10-25 10:10:42 +02:00
Florian Klink dc84a7d4e3
Merge pull request #71291 from NinjaTrappeur/nin-update-acme
simp_le: 0.9.0 -> 0.16.0
2019-10-24 16:08:02 +02:00
Frederik Rietdijk 32389de159 Merge master into staging-next 2019-10-24 08:27:04 +02:00
Eelco Dolstra 52e739cc58 nix-daemon.nix: Fix checkConfig 2019-10-23 21:30:28 +02:00
Félix Baylac-Jacqué 0c0af28cd5 nixos/tests/letsencrypt: use Pebble instead of Boulder
Let's encrypt bumped ACME to V2. We need to update our nixos test to
be compatible with this new protocol version.

We decided to drop the Boulder ACME server in favor of the more
integration test friendly Pebble.

- overriding cacert not necessary
- this avoids rebuilding lots of packages needlessly
- nixos/tests/acme: use pebble's ca for client tests
- pebble always generates its own ca which has to be fetched

TODO: write proper commit msg :)
2019-10-23 21:17:17 +02:00
Drew 6445a7cf7d users-groups: fix typo
Fix typo in the ``users.users.<name>.packages`` option description.
2019-10-23 20:49:15 +02:00
Ricardo M. Correia 4cd2cb43fb
Merge pull request #71137 from erictapen/smokeping-fix-permission
nixos/smokeping: replace smokeping.fcgi with a symlink
2019-10-23 18:19:15 +00:00
Frederik Rietdijk 09c9a2de7e Merge master into staging-next 2019-10-23 16:50:09 +02:00
Félix Baylac-Jacqué 38e84151e0 certbot: 0.31.0 -> 0.39.0
Updating:

- nixos module to use the new `account_reg.json` file.
- use nixpkgs pebble for integration tests.

Co-authored-by: Florian Klink <flokli@flokli.de>

Replace certbot-embedded pebble
2019-10-23 13:12:11 +02:00
Florian Klink c3098d182d nixos/network: remove 99-main.network
Just maching all network interfaces caused many breakages, see #18962
and #71106.

We already don't support the global networking.useDHCP,
networking.defaultGateway(6) options if networking.useNetworkd is
enabled, but direct users to configure the per-device
networking.interfaces.<name?>.… options.
2019-10-23 11:39:27 +02:00
Frederik Rietdijk a85e58ac13 Merge master into staging-next 2019-10-23 09:38:37 +02:00
Bjørn Forsman 263a81e285 nixos-rebuild: support sudo + --target-host
This adds support for deploying to remote hosts without being root:

  sudo nixos-rebuild --target-host non-root@host

Without this change, only root@host is able to deploy.

The idea is that if the local command is run with sudo, so should the
remote one, thus there is no need for adding any CLI options.
2019-10-22 20:44:25 +02:00
Aaron Andersen 43a3d8dc29
Merge pull request #71461 from etu/lidarr-specify-datadir-option
nixos/lidarr: Add dataDir option
2019-10-22 05:07:49 -04:00
Frederik Rietdijk a456fbfeed Merge staging-next into staging 2019-10-22 09:20:03 +02:00
worldofpeace 4f890f86fe
Merge pull request #71547 from hedning/seahorse-ssh-askpass
nixos/seahorse: Use seahorse's askpass by default
2019-10-21 21:43:52 +00:00
Malte Brandy fe143bac5b nixos/redis: Disable hugepages for redis via sysctl and not via a systemd-oneshot 2019-10-21 22:38:16 +02:00
Florian Klink 1125fb02cc
Merge pull request #71428 from talyz/gitlab-already-initialized-constant
gitlab: Get rid of most 'already initialized constant'-warnings
2019-10-21 20:52:54 +02:00
Tor Hedin Brønner aa910d164d nixos/seahorse: use seahorse's askpass by default 2019-10-21 18:01:15 +02:00
Franz Pletz cc9b18f223
Merge pull request #71406 from astro/collectd
collectd: plugins configuration, buildMinimalPackage
2019-10-21 10:34:34 +00:00
edef 0599c89d58
Merge pull request #71338 from edef1c/nix-daemon-opt-aliases
nixos/nix-daemon: don't refer to deprecated option aliases
2019-10-21 09:59:13 +00:00
Aaron Andersen 1c4b13bb5b
Merge pull request #71067 from aanderse/httpd
nixos/httpd: remove deprecated extraSubservices option
2019-10-20 20:36:33 -04:00
Florian Klink f24b4fb411
nixos/networkmanager: remove networking.networkmanager.dynamic… (#71337)
nixos/networkmanager: remove networking.networkmanager.dynamicHosts
2019-10-21 02:33:28 +02:00
Aaron Andersen 9a91679b7a nixos/httpd: remove deprecated extraSubservices option 2019-10-20 20:16:45 -04:00
worldofpeace d67b8a9eb1
Merge pull request #71456 from vcunat/p/doc-interface-naming
nixos release notes: interfaces might get renamed
2019-10-21 00:12:44 +00:00
Vladimír Čunát 9a54d17799 nixos release notes: interfaces might get renamed
Fixes #71086.
2019-10-20 20:12:03 -04:00
worldofpeace 64468d4121
Merge pull request #70931 from symphorien/system-config-printer
system-config-printer: 1.5.11 -> 1.5.12
2019-10-20 23:39:48 +00:00
worldofpeace 18ea428e76 rl-1909: add note for blueman 2019-10-20 19:37:13 -04:00
Dima a16de399a1 release-notes 19.09: removal of non-LTS kernel attrs
Even though the release obviously already happened, I think it might
still make sense to add a short note about the attributes not being
supported any longer (and going forward).

(cherry picked from commit 7163d3a9df)
(cherry picked from commit a64b8c3c19)
2019-10-20 19:35:22 -04:00
Elis Hirwing 9319dd17d8
nixos/lidarr: Add dataDir option
This will bring this module to a state to be consistent with how the
other forks (sonarr & radarr) works.
2019-10-20 21:20:53 +02:00
Jan Tojnar f849554226
Merge branch 'staging-next' into staging 2019-10-20 16:49:29 +02:00
Florian Klink ca6c91e395 nixos/networkmanager: remove networking.networkmanager.dynamicHosts
This option was removed because allowing (multiple) regular users to
override host entries affecting the whole system opens up a huge attack
vector. There seem to be very rare cases where this might be useful.
Consider setting system-wide host entries using networking.hosts,
provide them via the DNS server in your network, or use
networking.networkmanager.appendNameservers to point your system to
another (local) nameserver to set those entries.
2019-10-20 16:37:41 +02:00
Florian Klink 0a4373a46d
Merge pull request #71319 from talyz/gitlab-revert-clear-out-initializers
Revert "nixos/gitlab: properly clear out initializers"
2019-10-20 13:38:14 +02:00
worldofpeace 42f567b30d Revert "nixos/gnome3: fix gnome-flashback"
This reverts commit 60aedadc59.

Using tests from #71212 I am now unable to reproduce there being issues
with starting the default metacity flashback session without this.
2019-10-19 19:57:49 -04:00
Astro 06abd24886 nixos/collectd: add option buildMinimalPackage 2019-10-20 00:53:49 +02:00
Astro e2283d9533 nixos/collectd: add plugin config 2019-10-20 00:53:49 +02:00
worldofpeace a13b8ce0b8
Merge pull request #71115 from hedning/plymouth-gdm-fix
nixos/plymouth: do not order `plymouth-quit` after `display-manager`
2019-10-19 22:34:46 +00:00
talyz ed4a09c6f3 gitlab: Get rid of most 'already initialized constant'-warnings
On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.
2019-10-19 19:30:28 +02:00
edef 5b1f864242
Merge pull request #59806
openssh: 7.9p1 -> 8.1p1
2019-10-19 12:16:08 +00:00
Will Dietz 6db7c9cf1d nixos: add release note for openssh upgrade \o/ 2019-10-19 12:05:27 +00:00
worldofpeace cf05f707d8
Merge pull request #71210 from worldofpeace/fix-gnome-flashback
nixos/gnome3: fix gnome-flashback
2019-10-18 23:57:45 +00:00
worldofpeace 1554e4a95e
Merge pull request #71298 from symphorien/nm-fortissl
networkmanager-fortisslvpn: create the local state directory
2019-10-18 23:50:33 +00:00
Symphorien Gibol a37b9636f7 networkmanager-fortisslvpn: create the local state directory
Otherwise connecting simply fails:
VPN connection: failed to connect: 'La création du fichier « /tmp/lib/NetworkManager-fortisslvpn/0507e3ef-f0e0-4153-af64-b3d9a025877c.config.XSB19Z » a échoué : No such file or directory'
2019-10-18 19:49:56 -04:00
worldofpeace 676a988b8c
Merge pull request #71355 from chkno/fix-storeContents-doc
nixos/make-iso9660-image: Fix storeContents documentation
2019-10-18 21:49:46 +00:00
worldofpeace 30cfe8d5f1
Merge pull request #71341 from edef1c/rabbitmq-example
nixos/rabbitmq: use a literalExample for example configItems
2019-10-18 21:07:02 +00:00
Chuck ac65940537 nixos/make-iso9660-image: Fix doc typo 2019-10-18 11:58:28 -07:00
Chuck 4623f0a2c6 nixos/make-iso9660-image: Fix storeContents documentation
`packages` was renamed to `storeContents` in
668c146e33, but this comment
describing its purpose was not updated to match.
2019-10-18 11:58:05 -07:00
Florian Klink c41b37ef25
nixos/networkmanager: use tmpfiles to setup state directories (#71322)
nixos/networkmanager: use tmpfiles to setup state directories
2019-10-18 17:58:45 +02:00
edef 32c7f772f7 nixos/rabbitmq: use a literalExample for example configItems 2019-10-18 12:36:16 +00:00
edef a68219b79b nixos/nix-daemon: don't refer to deprecated option aliases
The `gc-` prefixed versions of these options have been
deprecated since Nix 2.0.
2019-10-18 12:27:43 +00:00
Frederik Rietdijk 1b5c537f45 Merge staging-next into staging 2019-10-18 12:27:41 +02:00
Florian Klink 5e593038d1 nixos/networkmanager: use tmpfiles to setup state directories 2019-10-18 12:11:55 +02:00
WilliButz 917b127314
Merge pull request #71243 from d-goldin/prometheus_blackbox_configfile
prometheus-blackbox-exporter: coercing cfg to path
2019-10-18 08:11:03 +02:00
talyz 201cca9a04 Revert "nixos/gitlab: properly clear out initializers"
This reverts commit 2ee14c34ed.

This caused the initializers directory to be cleaned out while gitlab
was running in some instances. We clean out the directory on the
preStart stage already, so ensuring existance and permissions should
suffice.
2019-10-18 08:00:56 +02:00
Dima b788467ec4 prometheus-blackbox-exporter: fixing path issue
This fixes an issue with a recent addition of a config file
check in c28ded36ef.

Previously it was possible to supply a path as a string
to `configFile`. Now it will fail checking the config file
during evaluation of the module due to sandboxing.

A toggle to disable the check, more informative log messages
and handling for various configFile values are added.
2019-10-18 02:03:02 +02:00
Eelco Dolstra 5b324c1825
Remove references to the nixpkgs-channels repo
Channel branches are now provided in the nixpkgs repo.

Issue #71176.
2019-10-17 19:44:03 +02:00
Frederik Rietdijk 0256080d11 nixos/pppd: add description for peers, unbreaks metrics job and channel
services.pppd.peers was lacking a description, causing a trace warning
resulting in a parse error in the metrics job.
2019-10-17 13:59:52 +02:00
Florian Klink 36756e930f udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 2019-10-16 20:31:33 -04:00
Franz Pletz ec6224b6cd Revert "installer: Disable udisks"
This reverts commit 571fb74f44.

The dependency on gtk2 was removed.

Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 20:31:24 -04:00
Franz Pletz 3d832dee59 gnupg: disable gui/pinentry support by default
This solves the dependency cycle in gcr alternatively so there won't be
two gnupg store paths in a standard NixOS system which has udisks2 enabled
by default.

NixOS users are expected to use the gpg-agent user service to pull in the
appropriate pinentry flavour or install it on their systemPackages and set
it in their local gnupg agent config instead.

Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 20:31:16 -04:00
Franz Pletz c2576266ba nixos/gnupg: add option for setting pinentry flavours
Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 20:31:05 -04:00
Franz Pletz cb0adc11ff pinentry: build with multiple outputs in single drv
Co-authored-by: Florian Klink <flokli@flokli.de>
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-10-16 20:30:52 -04:00
worldofpeace 2fbccbc728 Revert "Merge pull request #71095 from flokli/pinentry-cleanup"
This reverts commit 823da4d492, reversing
changes made to b75c8ee3bc.
2019-10-16 20:28:21 -04:00
worldofpeace 823da4d492
Merge pull request #71095 from flokli/pinentry-cleanup
Split pinentry flavors and enable udisks2 on install media again
2019-10-17 00:24:15 +00:00
Florian Klink e397b949a9 udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 2019-10-16 19:56:50 -04:00
Franz Pletz b04b354e2c Revert "installer: Disable udisks"
This reverts commit 571fb74f44.

The dependency on gtk2 was removed.

Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 19:56:50 -04:00
Franz Pletz b5bea4ce32 gnupg: disable gui/pinentry support by default
This solves the dependency cycle in gcr alternatively so there won't be
two gnupg store paths in a standard NixOS system which has udisks2 enabled
by default.

NixOS users are expected to use the gpg-agent user service to pull in the
appropriate pinentry flavour or install it on their systemPackages and set
it in their local gnupg agent config instead.

Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 19:56:50 -04:00
Franz Pletz edea9fed72 nixos/gnupg: add option for setting pinentry flavours
Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 19:56:49 -04:00
Franz Pletz a4916fdea5 pinentry: build with multiple outputs in single drv
Co-authored-by: Florian Klink <flokli@flokli.de>
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-10-16 19:56:49 -04:00
Florian Klink fff04a0a49
nixos/pppd: init (#71105)
nixos/pppd: init
2019-10-17 01:15:55 +02:00
worldofpeace 0dbbeabdab nixos/gnome3: copy flashback gschema overrides 2019-10-15 20:56:09 -04:00
worldofpeace 60aedadc59 nixos/gnome3: fix gnome-flashback
This session would fail to start because we didn't have it in systemd.packages
(as we've switched to systemd gnome-session).

Haven't tested custom sessions.
2019-10-15 20:15:46 -04:00
David Anderson ae02b3dd1f nixos/tests/pppd: init
This test creates a PPPoE link between two machines, and verifies
that the machines can ping each other.
2019-10-15 08:36:09 -07:00
David Anderson 997a6f6f1e nixos/pppd: init 2019-10-15 08:36:09 -07:00
Tor Hedin Brønner 2c7f0f06b7
nixos/system-environment: prepend wrapperDir to PATH (#70430)
This fixes user environment setup for sessions which doesn't successfully go
through a shell init.

Note we don't go through `sessionVariables` as we want the wrappers to have
highest priority. It would also cause wrapperDir to occur twice when in shell
sessions, as shells use `sessionVariables` too while prepending wrapperDir in a
custom snippet.

In particular logging in and out of gnome-shell could result in a broken path
without this fix.
2019-10-15 13:17:38 +02:00
Jörg Thalheim faa7ce3ee5
Merge pull request #70240 from woffs/pr-etc-zpool.d
nixos module zfs: provide /etc/zfs/zpool.d
2019-10-15 11:45:52 +01:00
Maximilian Bosch 7774945b70
Merge pull request #70469 from Vskilet/matrix-synapse-update
matrix-synapse: 1.3.1 -> 1.4.0
2019-10-15 01:31:21 +02:00
Victor SENE 372422390f
matrix-synapse: 1.3.1 -> 1.4.0
Bumps `matrix-synapse` to version 1.4.0[1]. With this version the
following changes in the matrix-synapse module were needed:

* Removed `trusted_third_party_id_servers`: option is marked as deprecated
  and ignored by matrix-synapse[2].
* Added `account_threepid_delegates` options as replacement for 3rdparty
  server features[3].
* Added `redaction_retention_period` option to configure how long
  redacted options should be kept in the database.
* Added `ma27` as maintainer for `matrix-synapse`.

Co-Authored-By: Notkea <pacien@users.noreply.github.com>
Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>

[1] https://matrix.org/blog/2019/10/03/synapse-1-4-0-released
[2] https://github.com/matrix-org/synapse/pull/5875
[3] https://github.com/matrix-org/synapse/pull/5876
2019-10-15 01:11:18 +02:00
Arian van Putten 8fb23f6117
Fix typo in 19.09 release notes 2019-10-14 23:30:09 +02:00
Justin Humm b8cd11f347
smokeping: add erictapen as maintainer 2019-10-14 21:23:11 +02:00
Justin Humm 9eb067b0d7
nixos/smokeping: replace smokeping.fcgi with a symlink
This fixes a regression from bb649d96b0.
There were permission problems, when the preStart script tried to copy
the smokeping.fcgi file over the old file.
2019-10-14 21:11:47 +02:00
WilliButz 104b93eef0
Merge pull request #70070 from Ma27/borgbackup-removable-devices
nixos/borgbackup: add option to allow removable devices
2019-10-14 18:02:30 +02:00
Maximilian Bosch 2dfc67517a
nixos/borgbackup: add option to allow removable devices
When having backup jobs that persist to a removable device like an
external HDD, the directory shouldn't be created by an activation script
as this might confuse auto-mounting tools such as udiskie(8).

In this case the job will simply fail, with the former approach
udiskie ran into some issues as the path `/run/media/ma27/backup` was
already there and owned by root.
2019-10-14 17:28:44 +02:00
Tor Hedin Brønner 5924bab20b nixos/plymouth: do not order plymouth-quit after display-manager
GDM now specifies ordering between `plymouth-quit` and `display-manager`:
9be5321097

This causes an ordering cycle between GDM and plymouth-quit which can result in
systemd breaking GDM:
```
plymouth-quit.service: Job display-manager.service/start deleted to break
                       ordering cycle starting with plymouth-quit.service/start
```

Not sure how often this triggers, as I've run my system with plymouth and
9be5321097 without any issues. But I did catch a VM doing this.

NOTE: I also tried to remove the ordering in GDM to see if plymouth managed to
live longer, but it didn't seem to help. So I opted to stick as close to
upstream (upstream GDM specifies ordering, but plymouth does not).
2019-10-14 13:08:51 +02:00
Jörg Thalheim d633ec9787
Merge pull request #70601 from Mic92/zfs-trim
nixos/zfs: only enable trim if zfs is enabled
2019-10-14 11:04:35 +01:00
Jörg Thalheim 12880e57e1
nixos/zfs: mention trim support in the release notes 2019-10-14 10:30:59 +01:00
Jörg Thalheim 9a89467606
nixos/zfs: simplify logic for scrub/autosnapshot service
This makes them consistent with the way zfs.trim is enabled
and allow to enable them by default in future.
2019-10-14 10:30:57 +01:00