From 0299af84a77b751d05903f7a01ff381682e0c214 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 28 Mar 2022 22:57:48 +0700 Subject: [PATCH] hosts: move nginx from caramel to sugarcane (cherry picked from commit 613280b0e22140be7b662c27c311a31751646ba9) --- hosts/sugarcane/default.nix | 34 +++++++++++++++++++--------------- modules/system/wireguard.nix | 4 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix index fb2a276..d5ed5dd 100644 --- a/hosts/sugarcane/default.nix +++ b/hosts/sugarcane/default.nix @@ -7,22 +7,26 @@ passwd.file = ../../secrets/passwd.age; wg_sugarcane.file = ../../secrets/wg_sugarcane.age; }; - imports = with modules.system; [ - (modulesPath + "/profiles/qemu-guest.nix") - inputs.home-manager-raccoon.nixosModule + imports = + (with modules.system; [ + (modulesPath + "/profiles/qemu-guest.nix") + inputs.home-manager-raccoon.nixosModule - base - home-manager - input - nix-stable - security - wireguard + base + home-manager + input + nix-stable + security + wireguard - ./filesystem.nix - ./kernel.nix - ./networking.nix - ./packages.nix + ./filesystem.nix + ./kernel.nix + ./networking.nix + ./packages.nix - ../../users/hana - ]; + ../../users/hana + ]) ++ + (with modules.services; [ + nginx + ]); } diff --git a/modules/system/wireguard.nix b/modules/system/wireguard.nix index 97717db..af17abe 100644 --- a/modules/system/wireguard.nix +++ b/modules/system/wireguard.nix @@ -6,8 +6,8 @@ let serverIp = "51.79.240.130"; forwarding = { - "80" = [ "10.100.0.2" "80" ]; - "443" = [ "10.100.0.2" "443" ]; +# "80" = [ "10.100.0.2" "80" ]; +# "443" = [ "10.100.0.2" "443" ]; "22727" = [ "10.100.0.3" "7777" ]; };