Frederik Rietdijk
1523382160
Merge master into staging-next
2020-06-13 11:02:21 +02:00
Emery Hemingway
b8a9e3eea1
nixos/lib/make-disk-image.nix: VDI support
2020-06-13 11:08:48 +05:30
John Ericson
1c4480e931
Merge pull request #90157 from obsidiansystems/socket-based-ipfs
...
Add socket-based IPFS support
2020-06-12 18:31:01 -04:00
Matthew Bauer
2c2f6c0b38
nixos/ipfs: only set listenstream when gateway/api is default
2020-06-12 17:15:34 -05:00
Matthew Bauer
982a17a48e
nixos/ipfs: always expose sockets
2020-06-12 17:15:34 -05:00
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
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
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
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