Commit Graph

18856 Commits

Author SHA1 Message Date
github-actions[bot]
bf39715fe0
Merge staging-next into staging 2021-11-03 12:01:58 +00:00
Maciej Krüger
f9bbc60cfb
nixos/odoo: apply suggestions from review 2021-11-03 12:40:59 +01:00
Maciej Krüger
19781e6663
Merge pull request #120965 from mkg20001/lxd-roundup 2021-11-03 11:10:24 +01:00
Cole Helbling
516b49155e nixos/zfs: replace parentheses with braces
The parentheses prevent the `continue` line from working by running the
enclosed in a subshell -- I noticed that ZFS would start asking me for
my password to encrypted child datasets, even though they were not
specified in `requestEncryptionCredentials`. The following logs would
also be present in the import unit's journal:

    Oct 31 22:13:17 host systemd[1]: Starting Import ZFS pool "pool"...
    Oct 31 22:13:44 host zfs-import-pool-start[3711]: importing ZFS pool "pool"...
    Oct 31 22:13:44 host zfs-import-pool-start[4017]:pool/nix/store/39zij3xcxn4w38v6x8f88bx8y91nv0rm-unit-script-zfs-import-pool-start/bin/zfs-import-pool-start: line 31: continue: only meaningful in a `for', `while', or `until' loop
    Oct 31 22:13:44 host zfs-import-pool-start[4020]:pool/nix/store/39zij3xcxn4w38v6x8f88bx8y91nv0rm-unit-script-zfs-import-pool-start/bin/zfs-import-pool-start: line 31: continue: only meaningful in a `for', `while', or `until' loop
    Oct 31 22:15:14 host zfs-import-pool-start[4023]: Failed to query password: Timer expired
    Oct 31 22:15:14 host zfs-import-pool-start[4024]: Key load error: encryption failure
    Oct 31 22:15:14 host systemd[1]: zfs-import-pool.service: Main process exited, code=exited, status=255/EXCEPTION
    Oct 31 22:15:14 host systemd[1]: zfs-import-pool.service: Failed with result 'exit-code'.
    Oct 31 22:15:14 host systemd[1]: Failed to start Import ZFS pool "pool".
2021-11-03 04:59:46 -04:00
Alyssa Ross
703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Pascal Bach
b01c019afd
Merge pull request #136191 from LeSuisse/nixos-unifi-poller-loki
nixos/unifi-poller: add support of Loki
2021-11-03 08:25:13 +01:00
Maciej Krüger
1c31f8db6a
nixosTest.lxdImage: add lxdImage test 2021-11-03 07:49:54 +01:00
Maciej Krüger
a797967cec
lxdImage: split from docker profile, use generators.toYAML 2021-11-03 07:49:54 +01:00
Maciej Krüger
fec499bb98
virtualisation.lxc: replace /sbin/init on switch
in the future maybe a proper shim-bootloader could be used that supports 
switching out /sbin/init (so nixos-rebuild boot would just switch the 
link)
2021-11-03 07:49:53 +01:00
Maciej Krüger
8eac2a669a
virtualisation.lxc: add default for .templates 2021-11-03 07:49:53 +01:00
Maciej Krüger
681bd59661
virtualisation.lxc: apply changes from review 2021-11-03 07:49:52 +01:00
Maciej Krüger
9f66f9a669
release.lxdImage: add lxdImage to hydra 2021-11-03 07:49:52 +01:00
Maciej Krüger
5ea329958a
virtualisation.lxc: add the overrides from distrobuilder 2021-11-03 07:49:52 +01:00
Maciej Krüger
1c7a7f198c
virtualisation.lxc: split meta and root 2021-11-03 07:49:51 +01:00
Maciej Krüger
d203189dbf
virtualisation.lxc: use openFirewall instead of allowedTCPPorts 2021-11-03 07:49:51 +01:00
Maciej Krüger
caabd8933c
virtualisation.lxc: add support for lxd templates 2021-11-03 07:49:51 +01:00
Maciej Krüger
b9df9ca2c4
virtualisation.lxc: indent config 2021-11-03 07:49:50 +01:00
Maciej Krüger
d262f6f593
virtualisation.lxc-container: overwrite tarball for lxd 2021-11-03 07:49:50 +01:00
Maciej Krüger
7667f641c9
systemd: disable systemd-udev-trigger.service in containers 2021-11-03 07:49:50 +01:00
Maciej Krüger
9d3df0b2ac
nixos/lxd: fix nftables switch #81172 breaking module 2021-11-03 07:41:40 +01:00
Maciej Krüger
f7dbaa0754
Merge pull request #144172 from mkg20001/odoo 2021-11-03 03:59:44 +01:00
Aaron Andersen
fc98560b99
Merge pull request #142433 from aanderse/flirc
flirc: init at 3.24.3
2021-11-02 22:55:41 -04:00
Maciej Krüger
abc90b4851
nixos/odoo: init 2021-11-03 03:52:41 +01:00
Aaron Andersen
45891c5f1c
Merge pull request #143705 from felschr/ddclient-password-file
nixos/ddclient: replace password with passwordFile option
2021-11-02 19:42:49 -04:00
github-actions[bot]
36b42d42c9
Merge staging-next into staging 2021-11-02 12:02:08 +00:00
Michele Guerini Rocco
b67e752c29
Merge pull request #144210 from evils/fancontrol
nixos/fancontrol: restart on-failure
2021-11-02 10:22:25 +01:00
Evils
9cb2107476 nixos/fancontrol: restart on-failure 2021-11-02 09:24:31 +01:00
github-actions[bot]
5cac0ef189
Merge staging-next into staging 2021-11-02 06:01:58 +00:00
github-actions[bot]
4b2ca106c9
Merge master into staging-next 2021-11-02 06:01:22 +00:00
Michael Fellinger
cb3a0f55e8 stage2: use atomic bind mounts 2021-11-01 20:12:59 -07:00
Jonas Heinrich
50029ed89c nixos/dokuwiki: add missing option enable 2021-11-02 09:23:06 +09:00
github-actions[bot]
3f03065e05
Merge staging-next into staging 2021-11-02 00:02:12 +00:00
github-actions[bot]
d27dd6653e
Merge master into staging-next 2021-11-02 00:01:32 +00:00
Sandro
c3051ea7c2
Merge pull request #144024 from SuperSandro2000/fix-plasma-users 2021-11-01 23:56:12 +01:00
Niklas Hambüchen
29f4f7110c nixos/smokeping: Add nh2 to maintainers 2021-11-01 23:20:40 +01:00
Niklas Hambüchen
c7ed7466c3 nixos/smokeping: Don't listen on all interfaces by default.
In general, NixOS services are configured such that by default
they are not exposed to the Internet for security, see #100192.
2021-11-01 23:20:40 +01:00
Niklas Hambüchen
bb2a6ec751 nixos/smokeping: Use requiredBy instead of wantedBy.
This makes switch-configuration fail if something is wrong with it,
which is desired especially for NixOps deployments.
2021-11-01 23:20:40 +01:00
Niklas Hambüchen
123171b557 nixos/smokeping: Remove partOf to ensure restarts work.
Details on https://github.com/NixOS/nixops/issues/1063#issuecomment-453253666.

`partOf` makes that if `smokeping.service` is stopped, `thttpd.service` will
be stopped as well.
(But not that `thttpd` will be started when `smokeping` is started).

Once `thttpd.service` is stopped that way, `Restart = always` will not apply.

When the smokeping config options are changed, NixOS's `switch-configuration.pl`
will stop `smokeping` (whit shuts down thttpd due to `partOf`), and then restart
smokeping; but this does not start thttpd.
As a result, thttpd will be off after changing the config, which isn't desired.

This commit fixes it by removing the `partOf`, which makes `Restart` work
as expected.
2021-11-01 23:20:40 +01:00
Niklas Hambüchen
17e4387b38 nixos/smokeping: Make default imgUrl relative.
This avoids a common problem:

Until now, port forwarding to multiple hosts running smokeping did not work;
they all show the data of the first smokeping instance.
That ws because the image URLs generated by smokeping are absolute
(`imgurl` setting).
Consequently, if you ran
  ssh node-1 -L 8081:localhost:8081
  ssh node-2 -L 8081:localhost:8082
  ssh node-3 -L 8081:localhost:8083
and try to open http://localhost:8081, http://localhost:8082 and
http://localhost:8083, they all would show the images of node-1!

Using a relative `imgurl` fixes that.
As per smokeping docs on `imgurl`:

> Either an absolute URL to the `imgcache` directory or one relative to the
> directory where you keep the SmokePing cgi.
2021-11-01 23:20:40 +01:00
Niklas Hambüchen
2760695df0 nixos/smokeping: Add host option.
Allows setting smokeping to not listen on the public Internet.
2021-11-01 23:20:40 +01:00
Niklas Hambüchen
0a2103547f nixos/smokeping: Remove bash wrapper, refactor.
The bash wrapper process served no purpose, and systemd directly controlling the
processes is more reliable / more responsive to systemctl commands.
2021-11-01 23:20:40 +01:00
markuskowa
6834ca6639
Merge pull request #143421 from ck3d/fix-neovim-EDITOR
nixos/neovim: Respect option defaultEditor
2021-11-01 21:14:04 +01:00
github-actions[bot]
83d6b7a7e0
Merge staging-next into staging 2021-11-01 18:01:40 +00:00
github-actions[bot]
bd0051cd54
Merge master into staging-next 2021-11-01 18:01:02 +00:00
Alyssa Ross
e791519f0f
nixos/qemu-vm: use qemu_kvm
qemu_kvm is only built for one architecture, so it's smaller and takes
MUCH less time to build if it has to be built from source.  And this
module doesn't support running a VM for one architecture from another
architecture, so the one architecture is all we'll need.
2021-11-01 12:04:45 +00:00
github-actions[bot]
bef900528f
Merge staging-next into staging 2021-11-01 00:02:05 +00:00
github-actions[bot]
7eaf56d92e
Merge master into staging-next 2021-11-01 00:01:32 +00:00
Sandro
33f7dd3cfd
Merge pull request #143620 from jtojnar/ppd 2021-10-31 22:48:45 +01:00
Sandro
89aa371808
Merge pull request #143745 from jwoudenberg/yubikey-agent-fixes 2021-10-31 21:56:56 +01:00
Guillaume Girol
9545fade8b
Merge pull request #142743 from symphorien/ihm-5-dev-2
python3.pkgs.ihatemoney: 4.2 -> 5.1.1
2021-10-31 19:32:40 +00:00