3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

17488 commits

Author SHA1 Message Date
Matthew Bauer fa06d8f961 nixos/ipfs: actually use upstream systemd units 2020-06-12 17:15:34 -05:00
Matthew Bauer b36ef706fb nixos/ipfs: add startWhenNeeded option
This makes it possible to only start IPFS when needed. So a user’s
IPFS daemon only starts when they actually use it.

A few important warnings though:

  - This probably shouldn’t be mixed with services.ipfs.autoMount
    since you want /ipfs and /ipns aren’t activated like this
  - ipfs.socket assumes that you are using ports 5001 and 8080 for the
    API and gateway respectively. We could do some parsing to figure
    out what is in apiAddress and gatewayAddress, but that’s kind of
    difficult given the nonstandard address format.
  - Apparently? this doesn’t work with the --api commands used in the tests.

Of course you can always start automatically with startWhenNeeded =
false, or just running ‘systemctl start ipfs.service’.

Tested with the following test (modified from tests/ipfs.nix):

  import ./make-test-python.nix ({ pkgs, ...} : {
    name = "ipfs";

    nodes.machine = { ... }: {
      services.ipfs = {
        enable = true;
        startWhenNeeded = true;
      };
    };

    testScript = ''
      start_all()

      machine.wait_until_succeeds("ipfs id")
      ipfs_hash = machine.succeed("echo fnord | ipfs add | awk '{ print $2 }'")

      machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
    '';
  })

Fixes #90145

Update nixos/modules/services/network-filesystems/ipfs.nix

Co-authored-by: Florian Klink <flokli@flokli.de>
2020-06-12 17:15:27 -05:00
Jörg Thalheim 8df5edc153
Merge pull request #87178 from hax404/teeworlds-module-test
nixos/{modules,tests}/teeworlds: init
2020-06-12 19:52:06 +01:00
Maximilian Bosch 267b93da34
Merge pull request #89662 from aanderse/ssmtp
nixos/ssmtp: add settings option
2020-06-12 16:09:13 +02:00
Michele Guerini Rocco a2fd1ba544
Merge pull request #89159 from datafoo/fix-issue-89158
nixos/networking: check interface state files exist before acting on them
2020-06-12 15:31:57 +02:00
Aaron Andersen ad2330f642 nixos/ssmtp: drop authPass option in favor of authPassFile, or services.ssmtp.settings.AuthPass if absolutely required 2020-06-12 06:41:56 -04:00
Frederik Rietdijk febc27b59a Merge master into staging-next 2020-06-12 08:57:26 +02:00
Matthew Bauer c5f40198f3 nixos/ipfs: consolidate services into one ipfs.service
Previously we had three services for different config flavors. This is
confusing because only one instance of IPFS can run on a host / port
combination at once. So move all into ipfs.service, which contains the
configuration specified in services.ipfs.

Also remove the env wrapper and just use systemd env configuration.
2020-06-11 15:27:22 -05:00
Matthew Bauer 74ff433320 nixos/ipfs: remove unused auto migrate feature 2020-06-11 14:32:06 -05:00
adisbladis a5a52e8c73
Merge pull request #88718 from adisbladis/vmware-xorg-driver-defaults
services.x11.videoDrivers: Don't include vmware driver on non-x86 platforms
2020-06-11 19:03:24 +02:00
adisbladis 1a5dafcd5b
services.x11.videoDrivers: Don't include vmware driver by default
A better option for vmware guests is to set `virtualisation.vmware.guest.enable`.
2020-06-11 18:49:29 +02:00
Martin Milata 876bf3abc9 nixos/prometheus-lnd-exporter: init 2020-06-11 18:23:54 +02:00
Matthew Bauer 656783a3d1
Merge pull request #89540 from Patryk27/fixes/lxd-lxcfs
Fix `lxd`, so that it works with `lxcfs`
2020-06-11 10:49:40 -05:00
Matthew Bauer a4959d36ef
Merge pull request #90128 from vcunat/p/locales-priority
nixos i18n.supportedLocales: increase systemPackages priority
2020-06-11 10:44:35 -05:00
WilliButz 3190ba12f7
Merge pull request #90077 from mdlayher/mdl-nixos-apcupsd
nixos/prometheus-apcupsd-exporter: new module
2020-06-11 15:23:33 +02:00
WilliButz 016a538f71
Merge pull request #89810 from mdlayher/mdl-keylight-exporter
prometheus-keylight-exporter: init at 0.1.1
2020-06-11 15:14:17 +02:00
Vladimír Čunát 92aa60918f
nixos i18n.supportedLocales: increase systemPackages priority
https://discourse.nixos.org/t/conflict-between-glibc-and-glibclocales-workaround-inside/7608
2020-06-11 10:22:20 +02:00
Matt Layher e45146d94b
nixos/prometheus-apcupsd-exporter: new module
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2020-06-10 17:33:41 -04:00
Fabian Hauser 9c95e8150a hamster: init at 3.0.2 2020-06-10 22:05:18 +02:00
Jörg Thalheim 7a4ee350b0
Merge pull request #90027 from Mic92/redis
nixos/redis: add redis group
2020-06-10 19:02:15 +01:00
Vladimír Čunát 13add13388
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
2020-06-10 20:00:44 +02:00
David Izquierdo f2d1568282 transmission: add libstdc++ and libgcc_s permissions to apparmor profile 2020-06-10 19:50:24 +02:00
Matt Layher e77426822f
nixos/prometheus-keylight-exporter: new module
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2020-06-10 13:12:43 -04:00
Vladimír Čunát a5f5d020c6
Merge branch 'staging-next' 2020-06-10 16:13:48 +02:00
José Romildo Malaquias a421af29e4
nixos/opensmtpd: add a setgid wrapper for smtpctl (#89962)
The setgid is currently required for offline enqueuing, and
unfortunately smtpctl is currently not split from sendmail so there's
little running around it.
2020-06-10 15:08:36 +02:00
Izorkin eed170d9ab nixos/mysql: fix init databases on first start in sandbox mode 2020-06-10 12:38:42 +03:00
Izorkin a9d5f088b5 nixos/mysql: update tmpfiles rules 2020-06-10 12:38:42 +03:00
Izorkin df7e52814d nixos/mysql: enable sandbox mode 2020-06-10 12:38:40 +03:00
Jörg Thalheim 10acf9ae00
nixos/redis: add redis group 2020-06-10 08:58:34 +01:00
Vladimír Čunát 16024fcaec
Merge branch 'staging-next' into staging
In particular, this fixes ISO evaluation.
2020-06-10 09:42:36 +02:00
Vladimír Čunát 6e9bb30566
Merge branch 'master' into staging-next
In particular, this fixes ISO evaluation.
2020-06-10 09:41:53 +02:00
Vladimír Čunát bc69d29164
Merge #89903: nixos/make-iso9660: fix zstd input 2020-06-10 08:40:03 +02:00
Peter Hoeg 5a0e9e63c7
Merge pull request #89457 from NixOS/f/pam_ordering
nixos/pam: mount encrypted home earlier
2020-06-10 10:12:21 +08:00
Jan Tojnar acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
Jan Tojnar c637cbe992
Merge branch 'master' into staging-next 2020-06-10 04:10:34 +02:00
zimbatm 9494fdeeb3
Merge pull request #70327 from abbradar/synapse-plugins
Refactor Synapse plugins, add matrix-synapse-pam
2020-06-09 23:54:54 +02:00
Jan Tojnar 35159ca5a2
Merge pull request #89881 from zowoq/gnome-artwork
nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork
2020-06-09 15:10:18 +02:00
Finn Behrens f73436b374
nixos/make-iso9660: fix zstd input 2020-06-09 11:39:26 +02:00
Eelco Dolstra 51e8a82f1e
Merge pull request #89297 from Ma27/bump-hydra
hydra-unstable: 2020-04-16 -> 2020-06-01
2020-06-09 11:19:47 +02:00
zowoq fa607bc939 nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork 2020-06-09 15:33:37 +10:00
Patryk Wychowaniec 8ae7ac9e8c
lxd: Add tests 2020-06-08 21:35:47 +02:00
Izorkin 1086ae52fb nixos/ssh: add crypto options 2020-06-08 22:10:36 +03:00
Alexandre Esteves 063043fa63
Fix typo 2020-06-08 16:47:46 +01:00
Frederik Rietdijk 8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Frederik Rietdijk dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
Florian Klink b56c66e7e8
Merge pull request #89762 from nlewo/nextcloud-oc_pass
nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper
2020-06-08 10:57:49 +02:00
Florian Klink 3590f02e7d
Merge pull request #88574 from JJJollyjim/qemu-vm-qboot-opt
nixos/qemu-vm: add option to use qboot
2020-06-08 10:46:11 +02:00
Jamie McClymont 55912f3535 nixos/qemu-vm: add option to use a non-standard BIOS
I'd like to change the default on x86 platforms to qboot at some point, since it
saves a fair bit of startup time.
2020-06-08 11:21:53 +12:00
Antoine Eiche cb682317b0 nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper
The OC_PASS environment variable can be used to create a user with
`occ user:add --password-from-env`. It is currently not possible to
use the `nextcloud-occ` to "non-interactively" create a user since
this variable is ignored by sudo.
2020-06-07 20:47:11 +02:00
worldofpeace d508591039
Merge pull request #86163 from worldofpeace/wallpaper-refactor
Gnome and Pantheon: install nixos wallpapers
2020-06-07 14:44:59 -04:00
Marek Mahut 7b9d7cc05d
Merge pull request #85947 from prusnak/images-zstd
Use zstd for ISO and SD images
2020-06-07 19:09:43 +02:00
Nadrieril e4f445008e
boot: fix order of arguments for hasPrefix (#89751) 2020-06-07 18:43:15 +02:00
Aaron Andersen 6394b12a07 nixos/ssmtp: add settings option 2020-06-07 10:28:22 -04:00
Frederik Rietdijk d0532e79ae Merge staging-next into staging 2020-06-07 09:25:46 +02:00
Frederik Rietdijk 6b8223e634 Merge master into staging-next 2020-06-07 09:25:12 +02:00
Georg Haas 6d1ca7db4a
nixos/{modules,tests}/teeworlds: init
add module and test
2020-06-06 17:06:23 +02:00
Janne Heß 644f9e74e7
nixos/freeswitch: Unit improvements and add fs_cli
This switches the unit to Restart=on-failure and switches the CPU policy
to fifo (the daemon tries to do that itself, but is denied permission).

Also add the package to $PATH to be able to use fs_cli easily.
2020-06-05 20:16:43 +02:00
Frederik Rietdijk 1c68570ab2 Merge staging-next into staging 2020-06-05 19:42:16 +02:00
Frederik Rietdijk 43f71029cc Merge master into staging-next 2020-06-05 19:40:53 +02:00
Jörg Thalheim 7048a817b2
Merge pull request #85418 from lopsided98/grub-initrd-secrets 2020-06-05 16:03:48 +01:00
Patryk Wychowaniec 6c6924b2eb
lxd: When lxcfs is enabled, start lxd with explicit LXD_LXC_TEMPLATE_CONFIG 2020-06-05 16:37:31 +02:00
Patryk Wychowaniec 72e80cdc54
lxd: Add proper support for nftables 2020-06-05 16:37:31 +02:00
Florian Klink 47d4cd2c31
Merge pull request #87878 from Izorkin/mariadb-update
mariadb: 10.4.12 -> 10.4.13
2020-06-05 15:15:36 +02:00
Eelco Dolstra b00463d406
Merge pull request #89479 from edolstra/nix-2.4-completion
Don't enable nix-bash-completions when using Nix 2.4
2020-06-05 13:29:10 +02:00
Jörg Thalheim abb2f6038c
Merge pull request #89525 from Mic92/cgmanager 2020-06-05 11:46:42 +01:00
Florian Klink c055fc0319
Merge pull request #89510 from flokli/buildbot-pbPort
nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
2020-06-05 11:50:25 +02:00
Jörg Thalheim 073d2fc4d5
cgmanager: remove
fixes #30023
2020-06-05 09:47:12 +01:00
Vladimír Čunát 677e3960b5
Merge #82342: rustPlatform: increase build-speed of checkPhase
...for rust-packages (into staging)
2020-06-05 09:12:30 +02:00
Florian Klink 1fd972bd50 nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
It's pbPort, and it's also a connection string, meaning
listen-on-localhost is also possible. Provide an alias for the old
option name, so old configs still work.
2020-06-05 01:29:03 +02:00
Ben Wolsieffer 14eceb5991 nixos/grub: support initrd secrets 2020-06-04 18:30:46 -04:00
Ben Wolsieffer 50a5e5597a nixos/stage-1: make boot.initrd.secrets appear in the manual 2020-06-04 17:53:29 -04:00
Frederik Rietdijk b7ff746540 python3: now points to python38
Note this also means python3Minimal is now also Python 3.8.

This reverts commit eb1369670b and adds more.
2020-06-04 18:08:29 +02:00
Frederik Rietdijk 08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Robin Gloster 79454f15ac
gitlab: 12.10.8 -> 13.0.3
https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/

The gitaly gitlab-shell config has moved into gitaly.toml. See
https://gitlab.com/gitlab-org/gitaly/-/issues/2182 for more info.
2020-06-04 14:32:39 +02:00
Eelco Dolstra bbfc47326b Don't enable nix-bash-completions when using Nix 2.4
2.4 has its own completion script which collides with
nix-bash-completions.
2020-06-04 14:18:18 +02:00
Peter Hoeg 66e040eaac nixos/pam: mount encrypted home earlier
This patch was done by curro:

The generated /etc/pam.d/* service files invoke the pam_systemd.so
session module before pam_mount.so, if both are enabled (e.g. via
security.pam.services.foo.startSession and
security.pam.services.foo.pamMount respectively).

This doesn't work in the most common scenario where the user's home
directory is stored in a pam-mounted encrypted volume (because systemd
will fail to access the user's systemd configuration).
2020-06-04 13:14:30 +08:00
Martin Weinelt d72a7360c2
nixos/tests/go-neb: init
Simple test to start the unit with a dummy client and a dummy service
and check if it can receive webhooks.
2020-06-04 01:44:33 +02:00
Michael Weiss a448d9156b
Merge pull request #89407 from primeos/empty-hostname-fix
nixos: Allow empty hostnames again
2020-06-03 16:18:28 +02:00
Michael Weiss a6afdbb70b
nixos: Allow empty hostnames again
This fixes a regression from 993baa587c which requires
networking.hostName to be a valid DNS label [0].
Unfortunately we missed the fact that the hostnames may also be empty,
if the user wants to obtain it from a DHCP server. This is even required
by a few modules/images (e.g. Amazon EC2, Azure, and Google Compute).

[0]: https://github.com/NixOS/nixpkgs/pull/76542#issuecomment-638138666
2020-06-03 15:23:37 +02:00
Eelco Dolstra aef2bc1330
nix: 2.3.6 -> 2.3.6 2020-06-03 14:57:39 +02:00
Jörg Thalheim 4cbf76797e
Merge pull request #89337 from mweinelt/hass-yaml-fun 2020-06-03 11:19:03 +01:00
Martin Weinelt da6b277f96
nixos/home-assistant: allow arbitrary yaml functions 2020-06-02 15:51:35 +02:00
Maximilian Bosch c18016cfbf
hydra-unstable: 2020-04-16 -> 2020-06-01 2020-06-02 15:39:42 +02:00
Martin Weinelt 642e9916c6
nixos/go-neb: init 2020-06-02 15:25:05 +02:00
Graham Christensen 4512cd1385
Merge pull request #60174 from exarkun/patch-2
Fix the rootPartitionUUID description
2020-06-02 08:54:51 -04:00
Jörg Thalheim 53d0dc6638
Merge pull request #51270 from aneeshusa/enable-setuid-wrapper-for-chsh
nixos/shadow: create setuid wrapper for chsh
2020-06-02 10:50:31 +01:00
Florian Klink 8a388c8296
Merge pull request #82258 from erikarvstedt/fix-xchg-caching
fix inconsistent caching of VM xchg dirs
2020-06-01 22:34:48 +02:00
Erik Arvstedt d85dc4f690
qemu-vm: fix inconsistent caching of xchg dirs
xchg is advertised as a bidirectional exchange dir, but file content
transfer from host to VM fails due to caching:
If a file is read in the VM and then modified on the host, subsequent
re-reads in the VM can yield old, cached data.
This is caused by the use of 9p's cache=loose mode that is explicitly
meant for read-only mounts.

9p doesn't provide any suitable cache modes, so fix this by disabling
caching.

Also, remove a now unnecessary sync in the test driver.
2020-06-01 21:55:33 +02:00
Lassulus 29062cec8d
Merge pull request #88744 from davidak/chromium-example
nixos/chromium: add example and update description
2020-06-01 18:24:01 +02:00
Florian Klink a2eccf3a30
Merge pull request #89274 from flokli/nscd-disable-positive-hosts-caching
nixos/nscd: set positive hosts caching ttl to 0
2020-06-01 17:24:02 +02:00
Maximilian Bosch 78ca0c506b
Merge pull request #89240 from jakobrs/formally-to-formerly
nixos/libvirtd: correct spelling
2020-06-01 17:14:54 +02:00
Wout Mertens 976187729e
Merge pull request #73350 from NixOS/wmertens-nixos-boot-doc
nixos boot doc: document boot.debug1devices
2020-06-01 12:01:58 +02:00
Notkea ab327b27a1
nixos/mautrix-telegram: add module (#63589) 2020-06-01 08:45:04 +00:00
Notkea 523743157a
matrix-appservice-discord: init at 0.5.2 (#62744)
* matrix-appservice-discord: init at 0.5.2

* nixos/matrix-appservice-discord: add module
2020-06-01 08:43:38 +00:00
Nikolay Amiantov cd92184f3d
matrix-synapse service: add plugins option 2020-06-01 10:30:22 +02:00
Tom Fitzhenry f3c8acc0bb nixos/doc: update stale fn name s/copy_file_from_host/copy_from_host/
This was renamed in the Perl -> Python test driver migration.
2020-06-01 18:05:58 +10:00
Florian Klink 09244cbd98 nixos/nscd: set positive hosts caching ttl to 0
This effectively disables nscd's built-in hosts cache, which turns out
to be erratic in some cases.

We only use nscd these days as a more ABI-neutral NSS dispatcher
mechanism.

Local caching should still be possible with local resolvers in
/etc/resolv.conf (via the `dns` NSS module), or without local resolvers
via systemd-networkd (via the `resolve` nss module)

We don't set enable-cache to no due to
https://github.com/NixOS/nixpkgs/pull/50316#discussion_r241035226.
2020-06-01 01:12:43 +02:00
Mario Rodas c9d9ba0f7b
Merge pull request #83307 from servalcatty/fix/v2ray-check
nixos/v2ray: check v2ray config during the build time
2020-05-31 16:32:03 -05:00
Florian Klink 09a7612cbe
Merge pull request #88434 from pstch/patch-2
nixos/haproxy: add reloading support, use upstream service hardening
2020-05-31 23:11:44 +02:00
Hugo Geoffroy c784d3ab76 nixos/haproxy: add reloading support, use upstream service hardening
Refactor the systemd service definition for the haproxy reverse proxy,
using the upstream systemd service definition. This allows the service
to be reloaded on changes, preserving existing server state, and adds
some hardening options.
2020-05-31 22:35:27 +02:00