diff --git a/hosts/amy/configuration.nix b/hosts/amy/configuration.nix index f0e48eb..b443286 100644 --- a/hosts/amy/configuration.nix +++ b/hosts/amy/configuration.nix @@ -43,6 +43,7 @@ interface = "ens18"; }; }; + services.resolved.enable = true; system.stateVersion = "23.11"; } diff --git a/roles/iceshrimp.nix b/roles/iceshrimp.nix index 43be589..0ee5836 100644 --- a/roles/iceshrimp.nix +++ b/roles/iceshrimp.nix @@ -6,5 +6,18 @@ settings.protected-mode = "no"; }; - # TODO: move rest of iceshrimp to amy + virtualisation.oci-containers.containers.iceshrimp = { + image = "git.ashhhleyyy.dev/shorks-gay/iceshrimp:2023.12.11.shorks1"; + autoStart = false; + environment = { + NODE_ENV = "production"; + }; + ports = [ + "3000:3000" + ]; + volumes = [ + "/home/ash/shorks-gay/files:/iceshrimp/files" + "/home/ash/shorks-gay/.config:/iceshrimp/.config:ro" + ]; + }; } diff --git a/roles/postgres.nix b/roles/postgres.nix index 5ea1c8f..6e603af 100644 --- a/roles/postgres.nix +++ b/roles/postgres.nix @@ -31,7 +31,7 @@ # ipv4 host all all 127.0.0.1/32 scram-sha-256 host all all 100.64.0.0/10 scram-sha-256 - host all all 10.0.0.0/8 scram-sha-256 + host all all 0.0.0.0/0 scram-sha-256 # ipv6 host all all ::1/128 scram-sha-256 '';