Commit Graph

21984 Commits

Author SHA1 Message Date
Pascal Wittmann 668bbeb2d2 nixos/subsonic: use jre8
The latest version of Subsonic (6.1.6) does not suport Java SE 9 or later
because it depends on the JAXB APIs. Those are considered to be Java EE
APIs are no longer contained on the default classpath in Java SE 9 and
are completely removed in Java SE 11..

(cherry picked from commit 14c5fe8c1b61c957ad45d0df801c7928d9e4d134)
2021-10-18 18:49:29 +00:00
Maximilian Bosch a255ac3b23
Merge pull request #141129 from Ma27/nextcloud-secret-backport
[21.05] nixos/nextcloud: put secrets into the environment of nextcloud-setup.service
2021-10-14 15:53:15 +02:00
github-actions[bot] e882bcae43
[Backport release-21.05] teamviewer: fix #96633, #44307 and #97148 + 15.15.5 -> 15.18.5 -> 15.22.3 (#141439)
* teamviewer: fix issue #96633

Fix teamviewer's breakage post 15.5.3 -> 15.15.5.

Teamviewer client was no longer able to connect to its backing
server as it now uses dbus to do so. Following changes were
required:

 -  add missing dbus and polkit service/policy files to package.
 -  add missing dbus lib to `LD_LIBRARY_PATH`.

Changes to the nixos module as a separate changeset.

(cherry picked from commit 506966d15658d8a411f364f47bbc0f3f9366dba3)

* nixos/teamviewer: fix issue #96633

Add teamviewer package as a dbus package now that the
client / server communication depends on dbus.

(cherry picked from commit 200e959995fa8088b5722bc8255109c03f2a4f78)

* nixos/teamviewer: fix issue #44307

Move to a forefront launch of the daemon. Doing so allowed us
to move the service from forking to simple to avoid the
missing pid  error log.

Also:

 -  Make the dbus dependency explicit.

(cherry picked from commit 953bbc0d7373102cf89625dc3bb7ab8e91134069)

* teamviewer: 15.15.5 -> 15.18.5

Upgrading to the last version still using qt5.14. Later version
will be using qt5.15 which is not in 21.05 stable branch.

This fixes us the crash observed in 15.15.5 when stopping
the service.

(cherry picked from commit db889eb9137a859eedfc5b402de84271c0659662)

* teamviewer: refactor executable wrapping

This centralizes `PATH` and `LD_LIBRARY_PATH`, avoid multiple
layers of wrappers.

Refactor as suggested by @Artturin in PR provided patch:
<https://github.com/NixOS/nixpkgs/pull/140076#issuecomment-934770391>.

(cherry picked from commit c55bc5bfd3377d54f5b6153d09c033cceadfcc05)

* teamviewer: fix 97148 (busybox installed issue)

Simply add `coreutils` as a runtime dependency which will
prevent teamviewer from using incomplete busybox implementation
of expected gnu binaries.

As suggested by @Artturin in PR comment:
<https://github.com/NixOS/nixpkgs/pull/140076#issuecomment-934770391>.

(cherry picked from commit 4fb188e1d190f2e08053dba3e2e95fff1e29183a)

* teamviewer: 15.18.5 -> 15.22.3

Required move from libsForQt514 -> libsForQt515.

Note that this changset won't be backportable to 21.05.

(cherry picked from commit 975ab7f3a02ac0232afe7920a8f7d78fc22d5ccb)

Co-authored-by: Raymond Gauthier <jraygauthier@gmail.com>
2021-10-13 05:17:24 +03:00
rnhmjoj 36d4e53859 nixos/fontdir: always link the font directory
This fixes the fonts directory availability when not running an xserver,
such as headless machines.

(cherry picked from commit a27dc95e72b5671df59e04853aa48a50d65f2031)
2021-10-11 17:45:58 +00:00
Linus Heckemann 4c0edbbb08 Revert "nixos/nextcloud: temp fix for MariaDB >=10.6"
This reverts commit f182b8d23b.

This doesn't need to be on 21.05, because 21.05 doesn't have MariaDB
10.6.

It shouldn't be on 21.05 because the package version warning mentions
21.11, which is confusing and misleading.
2021-10-10 09:34:53 +02:00
Maximilian Bosch e33cbdc2de
nixos/nextcloud: put secrets into the environment of nextcloud-setup.service
The `$(</path/to/file)`-expansion appears verbatim in the cmdline of
`nextcloud-occ` which means that an unprivileged user could find
sensitive values (i.e. admin password & database password) by monitoring
`/proc/<pid>/cmdline`.

Now, these values don't appear in a command line anymore, but will be
passed as environment variables to `nextcloud-occ`.

(cherry picked from commit 9f37d6aee028679b8a94be59d74984e708acaa85)
2021-10-09 20:05:38 +02:00
Pavel Borzenkov 73fbbdab68 calibre-web: 0.6.12 -> 0.6.13
calibre-web no longer starts without proper calibre DB path configured,
so the default testcase (completely unconfigured) is removed.

(cherry picked from commit 80f7656229efee8817880250b2ca097a69898330)
2021-10-08 11:14:44 -07:00
figsoda b9e787a6c4
Merge pull request #135304 from NixOS/backport-135150-to-release-21.05
[Backport release-21.05] nixos/rspamd: Avoid empty postfix service
2021-10-07 22:49:12 -04:00
Timothy DeHerrera 781b1f8e3a create-amis.sh: fix typo
(cherry picked from commit 3988440b124fc0576fda52d9753a640c1304dcd1)
2021-10-07 09:43:49 -07:00
Timothy DeHerrera db82eef3ec create-amis.sh: use status message
The progress ID is fairly useless. Status message is more useful for
humans.

(cherry picked from commit 4410ccc211c9127f343d8dceada26e9ba0f72687)
2021-10-07 09:43:49 -07:00
Timothy DeHerrera ff568a49ec create-amis.sh: add support for the ZFS AMIs
(cherry picked from commit 46bbf738eaebf82cf59391d38f5a9d77ecf53049)
2021-10-07 09:43:49 -07:00
Timothy DeHerrera 9e5f907d1d create-amis.sh: allow uploading private AMIs
(cherry picked from commit 423a70d4ee31bc9b1bbac3ccbb87b7085826fd81)
2021-10-07 09:43:49 -07:00
Timothy DeHerrera e33873f610 create-amis.sh: make vars overridable from env
(cherry picked from commit 0ffd7d80cab0e5e3e152d678e0107be3438cfda8)
2021-10-07 09:43:49 -07:00
Maximilian Bosch 50b29bf6aa nixos/nextcloud: run tests against each Nextcloud instance
(cherry picked from commit 10703a8c926e182311cdf538937517db33f4261c)
2021-10-01 19:13:18 +00:00
Maximilian Bosch c1541b370a nixos/nextcloud: use php8 where possible
(cherry picked from commit 66edc1e84625ed5b4bed5868f4093a570a822c2e)
2021-10-01 19:13:17 +00:00
Maximilian Bosch f182b8d23b nixos/nextcloud: temp fix for MariaDB >=10.6
The MariaDB version 10.6 doesn't seem supported with current Nextcloud
versions and the test fails with the following error[1]:

    nextcloud # [   14.950034] nextcloud-setup-start[1001]: Error while trying to initialise the database: An exception occurred while executing a query: SQLSTATE[HY000]: General error: 4047 InnoDB refuses to write tables with ROW_FORMAT=COMPRESSED or KEY_BLOCK_SIZE.

According to a support-thread in upstream's Discourse[2] this is because
of a missing support so far.

Considering that we haven't received any bugreports so far - even though
the issue already exists on master - and the workaround[3] appears to
work fine, an evaluation warning for administrators should be
sufficient.

[1] https://hydra.nixos.org/build/155015223
[2] https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/15
[3] setting `innodb_read_only_compressed=0`

(cherry picked from commit 675e262f5a03eb9aa6b0500434ee30a9d6b882a0)
2021-10-01 20:04:06 +02:00
Maximilian Bosch 8079b1a3c8
linux_5_13: drop
5.13.19 was the last 5.13 release and the version is now EOL[1].

[1] https://lwn.net/Articles/869747/

(cherry picked from commit 01eb8ec98a52c1e7317fd62f5bc58db30951e716)
2021-09-30 11:13:19 +02:00
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
Victor Nawothnig d6e9b8d66f nixos/rspamd: Avoid empty postfix service
(cherry picked from commit 942d78d9cdac3826059cbf351932cd5bcf1c315f)
2021-08-22 15:10:19 +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