kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

some patches to return to my main foe of download failures

Browse source
This commit is contained in:
Kiara Grouwstra 2025-05-10 07:02:49 +02:00
parent 21c4cab1e0
commit 23393f4cef
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
deployment/check/basic/nixosTest.nix
View file

@ -23,11 +23,24 @@ testers.runNixOSTest (
fakeMachine = pkgs.nixos [ fakeMachine = pkgs.nixos [
../basic/minimalTarget.nix ../basic/minimalTarget.nix
../../../launch/options.nix
../../../launch/shared.nix ../../../launch/shared.nix
../../../launch/garage.nix ../../../launch/garage.nix
../../../launch/mastodon.nix ../../../launch/mastodon.nix
../../../launch/pixelfed.nix ../../../launch/pixelfed.nix
../../../launch/peertube.nix ../../../launch/peertube.nix
{
terraform = {
domain = "fediversity.net";
hostname = "base";
initialUser = {
displayName = "Testy McTestface";
username = "test";
email = "test@test.com";
password = "testtest";
};
};
}
]; ];
extraDependenciesFromMachine = extraDependenciesFromMachine =

19
infra/common/nixos/networking.nix
View file

@ -18,25 +18,6 @@ in
## REVIEW: Do we actually need that, considering that we have static IPs? ## REVIEW: Do we actually need that, considering that we have static IPs?
useDHCP = mkDefault true; useDHCP = mkDefault true;
interfaces = {
eth0 = {
ipv4 = {
addresses = [
{
inherit (config.fediversityVm.ipv4) address prefixLength;
}
];
};
ipv6 = {
addresses = [
{
inherit (config.fediversityVm.ipv6) address prefixLength;
}
];
};
};
};
defaultGateway = lib.mkIf (config.fediversityVm ? ipv4) { defaultGateway = lib.mkIf (config.fediversityVm ? ipv4) {
address = config.fediversityVm.ipv4.gateway; address = config.fediversityVm.ipv4.gateway;
interface = "eth0"; interface = "eth0";

7
services/fediversity/pixelfed/default.nix
View file

@ -59,9 +59,10 @@ in
## NOTE: Pixelfed as packaged in nixpkgs has a permission issue that prevents Nginx ## NOTE: Pixelfed as packaged in nixpkgs has a permission issue that prevents Nginx
## from being able to serving the images. We fix it here, but this should be ## from being able to serving the images. We fix it here, but this should be
## upstreamed. See https://github.com/NixOS/nixpkgs/issues/235147 ## upstreamed. See https://github.com/NixOS/nixpkgs/issues/235147
services.pixelfed.package = pkgs.pixelfed.overrideAttrs (old: { # patching failed
patches = (old.patches or [ ]) ++ [ ./group-permissions.patch ]; # services.pixelfed.package = pkgs.pixelfed.overrideAttrs (old: {
}); # patches = (old.patches or [ ]) ++ [ ./group-permissions.patch ];
# });
users.users.nginx.extraGroups = [ "pixelfed" ]; users.users.nginx.extraGroups = [ "pixelfed" ];
services.pixelfed = { services.pixelfed = {