From 31f14b1578d115b16e1306ce65043ec8b97bf1b7 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 11 Sep 2024 21:58:40 -0400 Subject: [PATCH] Add Oracle VM to Wireguard --- nixos/server/pixelfed.nix | 2 +- nixos/server/wireguard.nix | 4 ++++ secrets.nix | Bin 2293 -> 2359 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/server/pixelfed.nix b/nixos/server/pixelfed.nix index 44f77d3..bc5b62b 100644 --- a/nixos/server/pixelfed.nix +++ b/nixos/server/pixelfed.nix @@ -4,7 +4,7 @@ domain = "pics.${outputs.secrets.jimDomain}"; secretFile = pkgs.writeText "appkey" outputs.secrets.pixelfedKey; settings = { - APP_NAME = "Jimbofed"; + APP_NAME = ''"Jimbo's Pixelfed"''; INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"''; INSTANCE_CONTACT_EMAIL = "jimbo@${outputs.secrets.jimDomain}"; OPEN_REGISTRATION = true; diff --git a/nixos/server/wireguard.nix b/nixos/server/wireguard.nix index 480047e..93a4ad4 100644 --- a/nixos/server/wireguard.nix +++ b/nixos/server/wireguard.nix @@ -25,6 +25,10 @@ in { publicKey = outputs.secrets.wirePixel9Pub; allowedIPs = [ "10.100.0.2/32" ]; } + { # Oracle VM + publicKey = outputs.secrets.wireOraclePub; + allowedIPs = [ "10.100.0.3/32" ]; + } ]; }; }; diff --git a/secrets.nix b/secrets.nix index ce61c5bd49adcc122e1f2c7efd1b0dd7fa82309e..e1087eeac474b4a6653fe77fd036eac5c680b11c 100644 GIT binary patch literal 2359 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 PK^fZS)+kP+n$F@WxX5T?