Commit Graph

21966 Commits

Author SHA1 Message Date
Ryan Mulligan d3bee2a63a discourse: enable restoring backups bigger than RAM
When restoring a backup, discourse decompresses the backup archive in
the /share/discourse/tmp dir. Before this change, it is linked to /run
which is typically backed by memory, so the backup will fail to
restore if you do not have enough memory on your system to contain the
backup. This has already happened to me on two small forums.

This moves tmp to the StateDirectory /var/lib/discourse/tmp which is
typically backed by disk.

(cherry picked from commit f933c68374b9c6195dc74d26c95fc9bf240fead8)
2021-09-24 12:35:53 +00:00
Ryan Mulligan 3061914340 nixos/discourse: add discourse.admin.skipCreate option
(cherry picked from commit 6a9003f31682e57a2a630f5cfdefa2969a64b1b1)
2021-09-23 17:14:07 +00:00
embr 04c2339cc1 nixos/mastodon: Add configurable web- and streaming concurrency
Might as well do this while I'm at it.

(cherry picked from commit 0d719125baee88e2e8d29e6bb2ff3100ba1b2da0)
2021-09-21 19:41:32 +02:00
embr 4f8927c417 nixos/mastodon: Fix sidekiq's DB_POOL, add configurable concurrency
The `services.mastodon` module currently hardcodes sidekiq's concurrency
to 25, but doesn't set a DB pool size, which defaults to 5 or the number
of configured web threads.

(This behaviour is very strange, and arguably a mastodon bug.)

This also makes sidekiq's concurrency configurable, because 25 is a tad
high for the hardware I'm running it on.

(cherry picked from commit e8fd7792d1eeb4ea4943cc34525da1159ab50bc9)
2021-09-21 19:41:32 +02:00
Jan Solanti 701e0a55b0 pipewire: 0.3.35 -> 0.3.36
(cherry picked from commit 996b51ee8569d7042ba1d92d87a51e9bf90e73b5)
2021-09-20 06:27:38 +00:00
Jan Solanti eae9551832 pipewire: 0.3.34 -> 0.3.35
(cherry picked from commit f4fbb211765c265203004014e63a4e149520f6b9)
2021-09-16 09:48:45 +00:00
Timothy DeHerrera f789739acc
Merge pull request #137665 from NixOS/backport-106574-to-release-21.05
[Backport release-21.05] nixos/amazonImageZfs: init
2021-09-13 13:48:12 -06:00
Your Name 76e99647cd services.zfs.expandOnBoot: support expanding pools on boot
Either enumerating a list of pools to expand or expanding
all pools on boot.

(cherry picked from commit 4bb4bcc30c7f481581ef462ed7b1dcca71693717)
2021-09-13 17:42:07 +00:00
Graham Christensen 337eb213cf amazon images: extend the image-info.json to have a disks object
Having a disks object with a dictionary of all the disks and their
properties makes it easier to process multi-disk images.

Note the rename of `label` to `system_label` is because `$label`i
is something of a special token to jq.

(cherry picked from commit 71b3d18181974523ef7264106a4bf213a3103439)
2021-09-13 16:20:47 +00:00
Graham Christensen a989fd1885 NixOS/amazonImageZfs: init
Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS
root.

This uses `make-zfs-image` which implies two EBS volumes are needed
inside EC2, one for boot, one for root. It should not matter which
is identified `xvda` and which is `xvdb`, though I have always
uploaded `boot` as `xvda`.

(cherry picked from commit bd38b059eae05871579b2dfd51cd41d058b6a1ec)
2021-09-13 16:20:46 +00:00
Graham Christensen 5d0154f812 nixos/make-zfs-image: init
This is a private interface for internal NixOS  use. It is similar
to `make-disk-image` except it is much more opinionated about what
kind of disk image it'll make.

Specifically, it will always create *two* disks:

1. a `boot` disk formatted with FAT in a hybrid GPT mode.
2. a `root` disk which is completely owned by a single zpool.

The partitioning and FAT decisions should make the resulting images
bootable under EFI or BIOS, with systemd-boot or grub.

The root disk's zpools options are highly customizable, including
fully customizable datasets and their options.

Because the boot disk and partition are highly opinionated, it is
expected that the `boot` disk will be mounted at `/boot`. It is
always labeled ESP even on BIOS boot systems.

In order for the datasets to be mounted properly, the `datasets`
passed in to `make-zfs-image` are turned in to NixOS configuration
stored at /etc/nixos/configuration.nix inside the VM.
NOTE: The function accepts a system configuration in the `config`
argument. The *caller* must manually configure the system
in `config` to have each specified `dataset` be represented
by a corresponding `fileSystems` entry.

One way to test the resulting images is with qemu:

```sh
boot=$(find ./result/ -name '*.boot.*');
root=$(find ./result/ -name '*.root.*');

echo '`Ctrl-a h` to get help on the monitor';
echo '`Ctrl-a x` to exit';

qemu-kvm \
    -nographic \
    -cpu max \
    -m 16G \
    -drive file=$boot,snapshot=on,index=0,media=disk \
    -drive file=$root,snapshot=on,index=1,media=disk \
    -boot c \
    -net user \
    -net nic \
    -msg timestamp=on
```

(cherry picked from commit 076f6e2d948259e18ddac8e562c62b5b53de9fe6)
2021-09-13 16:20:46 +00:00
Maximilian Bosch 042bd4f47b
nixos/kernel: add 5.14 to kernel test-suite
Same as 2444c11431a37e04de025b63f6a12bdd05d2f4c1 on master.
2021-09-12 23:15:14 +02:00
Maximilian Bosch 5a17bb5d2b nixos/privacyidea: use `sudo(8)` that's configured via the module
(cherry picked from commit 69e75754d57b4c9785058d663daa3817745930aa)
2021-09-12 18:13:58 +00:00
Zhaofeng Li f69c32ec21 nixos/promtail: Allow write access to positions file if not in CacheDirectory
Because of `ProtectSystem=strict`, Promtail cannot write to the positions
file if it's not in its `CacheDirectory` (the default value).

(cherry picked from commit b6ad701a2c6bf619fa9418a8e27c4940ce921456)
2021-09-12 16:21:38 +00:00
Pamplemousse 30048c7078 nixos/modules/jenkins: Test the CLI
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
(cherry picked from commit 4f093b8fdb3e6b7102ad99089712beca2ae49abb)
2021-09-08 18:04:54 +02:00
Pamplemousse 3b60f6b0fd nixos/modules/jenkins: Add option to add CLI
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
(cherry picked from commit 4265efef54bd5e2fe6d7dff3241d69ef3e86b161)
2021-09-08 18:04:54 +02:00
Domen Kožar fd6dba4719
Merge pull request #136392 from NixOS/backport-135819-to-release-21.05
[Backport release-21.05] pipewire: 0.3.33 -> 0.3.34
2021-09-06 13:24:38 +02:00
Artturin 3adca1abf6 nixos/pipewire: use absolute path for jack libs
(cherry picked from commit 756e60344fd83427148d8acf416c63573404a2e9)
2021-09-03 13:40:40 +00:00
Ilan Joselevich 1c7d3cae8c pipewire: 0.3.33 -> 0.3.34
(cherry picked from commit 70de7b5b453f7bf4ef0e889a48b00c009338030d)
2021-09-01 14:56:15 +00:00
Maximilian Bosch ebd597d2f3 nixos/nextcloud: apply doc fixes suggested by fabaff
Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
(cherry picked from commit 767bb4e4bbb9a8d06d4c3cbc14092902c2465f98)
2021-08-31 18:54:20 +00:00
Maximilian Bosch c19b0bf9de nixos/nextcloud: add some notes for `Error: Command "upgrade" is not defined.`
This error occurs if `nextcloud-occ maintenance:install` fails and the
`upgrade` command is attempted to be executed afterwards.

Due to the nature of the installer we can't do much about it, so I guess
it makes sense to add some notes about it. The other notes in the
`Pitfalls`-section are semantically a list of different topics, so I
changed that accordingly now.

Closes #111175

(cherry picked from commit 561418f996fc015f4db48b1c9b7c31338cb280d9)
2021-08-31 18:54:20 +00:00
Maximilian Bosch 0db1a5ee44 nixos/nextcloud: remove invalid `--database-table-prefix` option
This doesn't work anymore and thus breaks the installation leaving a
broken `/var/lib/nextcloud`.

It isn't a big deal since we set this value in the override config
before, so the correct table-prefix is still used. In order to confirm
that, I decided to add a custom prefix to the basic test.

(cherry picked from commit eaeb4fe04ee5a5ffae4f7dc03d3f072d59d80337)
2021-08-28 22:04:40 +00:00
talyz 698186588f gitlab: Enable puma's systemd notify support
(cherry picked from commit 3dd17ae22f17fb2f5f3bcf99437fe899d727beac)
2021-08-28 16:03:12 +02:00
talyz 2572e2550a gitlab: 14.1.2 -> 14.2.1
(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c)
2021-08-28 16:03:12 +02:00
Florian Klink e24074676b
Merge pull request #135318 from NixOS/backport-132347-to-release-21.05
[Backport release-21.05] captive-browser: fix empty string in interface args
2021-08-25 16:20:05 +02:00
Ankit Pandey 66e129b194 captive-browser: fix empty string in interface args
Fixes nmcli being passed an empty string before the interface name,
which would stop captive-browser from starting up.

(cherry picked from commit 910f233fb7120c51cb8cbbaed4fab4caa6e5d751)
2021-08-22 17:44:31 +00:00
Maximilian Güntner e6e8fe7633
nixos/tests/matrix-synapse: add email regression test case
twisted is used in matrix-synapse for smtp handling.
Mostly this is used for password resets, but also notifications
are delivered that way.

older versions of twisted require the e-mail server to
have TLS1.0 enabled.

Obviously, quite a lot of servers have this disabled which means
synapse won't be able to deliver mails using such servers.

matrix-synapse issue:

https://github.com/matrix-org/synapse/issues/6211
2021-08-22 16:46:44 +02:00
Zane van Iperen bd84f4a6ed nixos/gitea: init/migrate db in startup script
(cherry picked from commit 99d8d553da44fb065f9cb8bb54e2e93b85417fab)
2021-08-21 12:24:40 +09:00
Zane van Iperen 9d0618433a nixos/gitea: use gitea to refresh hooks and keys
Gitea now provides this functionality as an admin command.
Is significantly faster, especially on slow disks.

(cherry picked from commit c854b8570285ac4c14282a5efa0f8334a520ac8d)
2021-08-21 12:24:40 +09:00
Kim Lindberger a1007637ce
Merge pull request #133624 from talyz/discourse-backports
[21.05] discourse: 2.7.5 -> 2.7.7, plugins and fixes
2021-08-19 15:27:08 +02:00
Wael M. Nasreddine dff77786cf config.hardware.onlykey: update the udev rules for onlykey
The udev rules were updated upstream without an explanation as you can
see in [this comment][commit].

[commit]: 0bcf928ada

(cherry picked from commit eab36fabf6168f8fdbb2b835ce3ab689b9902ab1)
2021-08-19 03:25:13 +00:00
Wael M. Nasreddine 6c50c69d97 config.hardware.onlykey: move the module into its own folder
(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9)
2021-08-19 03:25:13 +00:00
Vladimír Čunát 7bbca9877c
Merge #134298: linux_5_12: remove (into release-21.05) 2021-08-18 09:26:59 +02:00
talyz fd169abf9b
discourse.plugins: Make the updater able to package plugins
Let the update.py script handle the initial, repetitive task of
packaging new plugins. With this in place, the plugin only needs to be
added to the list in `update-plugins` and most of the work will be
done automatically when the script is run. Metadata still needs to be
filled in manually and some packages may of course require additional
work/patching.

(cherry picked from commit f8096460bd15d4f13a01cfddf0a30798921fdb42)
2021-08-17 23:16:41 +02:00
talyz 080e4e43fb
discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.

(cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
2021-08-17 23:16:18 +02:00
talyz 639e1d9639
discourse: Remove leftover link to unused plugins directory
(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c)
2021-08-17 23:13:55 +02:00
Bjørn Forsman 991e12bfdb nixos: fix release notes about linux_latest version
It's version 5.13, not 5.12.

(cherry picked from commit a37965f7c5d26938774677e97b9f6c9e35bce701)
2021-08-17 07:12:42 +00:00
TredwellGit aa1af91878 linux_5_12: remove
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
(cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f)
2021-08-16 09:12:57 +00:00
Maxine Aubrey a657d429c9 nixos/traefik: wait for first success
possible fix for #115418

(cherry picked from commit 34add8ca5994dd594e1070ae93c0f503fd0661bc)
2021-08-14 13:11:54 +00:00
Artturi 7bd542a5e9
Merge pull request #133563 from NixOS/backport-133204-to-release-21.05
[Backport release-21.05] nixos/xserver: fix a display-manager race condition
2021-08-13 00:32:27 +03:00
Artturin 2fac4b6d00 nixos/gdm: disable the gdm services as it is redundant
and causes issues

(cherry picked from commit 47f6591706dcfb699b0e0d9f09a5a10648198d40)
2021-08-12 17:44:00 +00:00
Johannes Arnold 8404ac09e7 nixos/xserver: fix a display-manager race condition
(cherry picked from commit 358ab44a457aba9b227764742badbf1882028676)
2021-08-12 00:40:15 +00:00
Vladimír Čunát 5cd415124f nixos/tests: unbreak the tested job
I expect it suffices that the channel only blocks on one firefox ESR
test - the one for the default ESR.  I didn't want to have the
information about the default in two places, so either of the tests will
be evaluated twice (but to the same *.drv I hope).

(cherry picked from commit c0097aa84adb19a9e5d947487c118505faf98bc0)
2021-08-10 14:34:09 +00:00
Martin Weinelt 6c6d0f971f firefox-esr-91: init at 91.0esr
(cherry picked from commit d5f7fc95a9ec5798618d10fd04a3ef91aa08de76)
2021-08-10 14:54:58 +09:00
Martin Weinelt 23d5366206
Merge pull request #129436 from NixOS/backport-121750-to-release-21.05
[Backport release-21.05] nixos/acme: Ensure certs are always protected
2021-08-09 16:15:37 +02:00
Domen Kožar 8485c05212
Merge pull request #133116 from NixOS/pipewire-21.05-backport
Pipewire 21.05 backport: 0.3.30 -> 0.3.33
2021-08-08 23:15:18 +02:00
Ilan Joselevich 45ea565f6d pipewire: updated JSON configs
(cherry picked from commit a876500f5db7f7827c14d1d5b195186613c20a29)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 21:56:57 +02:00
Martin Weinelt e78cb53f25
Merge pull request #133000 from NixOS/backport-132735-to-release-21.05
[Backport release-21.05] nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
2021-08-08 14:36:00 +02:00
arcnmx 7be67825c8 nixos/pipewire: add bluez hardware database
(cherry picked from commit ef532a04436001249a7c24e13c628e970791dc7f)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:39:11 +02:00
arcnmx 4ef889251c pipewire: 0.3.30 -> 0.3.31
(cherry picked from commit eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:38:52 +02:00