diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-09 12:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 12:01:31 +0000 |
| commit | a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18 (patch) | |
| tree | d352d5a63ab185a31f3aefbf8b8de3100ab38090 /nixos | |
| parent | 6402a0d2a380dd0d6b86062cc5ec9c4c955ed2e4 (diff) | |
| parent | 7abd503e3f13322cc2ba7fed906aa13858888e11 (diff) | |
| download | nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar.gz nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar.bz2 nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar.lz nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar.xz nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.tar.zst nixlib-a43d6b1a9a9acfa29c2a899e549bfd278a5d0c18.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/lemmy.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/proxmox-image.nix | 22 | ||||
| -rw-r--r-- | nixos/tests/lemmy.nix | 10 |
3 files changed, 31 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index c6889e2f4041..1f2168b2a4c6 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -117,7 +117,7 @@ in file_server } @for_backend { - path /api/* /pictrs/* feeds/* nodeinfo/* + path /api/* /pictrs/* /feeds/* /nodeinfo/* } handle @for_backend { reverse_proxy 127.0.0.1:${toString cfg.settings.port} diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 7a6bfef44d28..4fca8ce9e7eb 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -127,8 +127,28 @@ with lib; name = "proxmox-${cfg.filenameSuffix}"; postVM = let # Build qemu with PVE's patch that adds support for the VMA format - vma = pkgs.qemu_kvm.overrideAttrs ( super: rec { + vma = (pkgs.qemu_kvm.override { + alsaSupport = false; + pulseSupport = false; + sdlSupport = false; + jackSupport = false; + gtkSupport = false; + vncSupport = false; + smartcardSupport = false; + spiceSupport = false; + ncursesSupport = false; + libiscsiSupport = false; + tpmSupport = false; + numaSupport = false; + seccompSupport = false; + guestAgentSupport = false; + }).overrideAttrs ( super: rec { + version = "7.0.0"; + src = pkgs.fetchurl { + url= "https://download.qemu.org/qemu-${version}.tar.xz"; + sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk="; + }; patches = [ (pkgs.fetchpatch { url = diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index 5436d0b300cc..543bd2ce57a5 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -23,6 +23,13 @@ in hostname = "http://${lemmyNodeName}"; port = backendPort; database.createLocally = true; + # Without setup, the /feeds/* and /nodeinfo/* API endpoints won't return 200 + setup = { + admin_username = "mightyiam"; + admin_password = "ThisIsWhatIUseEverywhereTryIt"; + site_name = "Lemmy FTW"; + admin_email = "mightyiam@example.com"; + }; }; caddy.enable = true; }; @@ -76,7 +83,8 @@ in # No path can return 200 until after we upload an image to pict-rs assert_http_code("${lemmyNodeName}/pictrs/", 404) - # The paths `/feeds/*` and `/nodeinfo/*` are not tested because they seem to be misconfigured + assert_http_code("${lemmyNodeName}/feeds/all.xml", 200) + assert_http_code("${lemmyNodeName}/nodeinfo/2.0.json", 200) assert_http_code("${lemmyNodeName}/some-other-made-up-path/", 404, "-X POST") assert_http_code("${lemmyNodeName}/some-other-path", 404, "-H 'Accept: application/activity+json'") |