diff --git a/hosts/pinwheel/modules/default.nix b/hosts/pinwheel/modules/default.nix index 0f5d693..8f51d36 100644 --- a/hosts/pinwheel/modules/default.nix +++ b/hosts/pinwheel/modules/default.nix @@ -40,7 +40,6 @@ in }; vm.enable = true; scripts.enable = true; - pppdotpm-site.enable = false; }; }; } diff --git a/hosts/test-vm/configuration.nix b/hosts/test-vm/configuration.nix index d6c5e2c..27321b8 100644 --- a/hosts/test-vm/configuration.nix +++ b/hosts/test-vm/configuration.nix @@ -1,13 +1,17 @@ { pkgs, ... }: { - imports = []; + imports = [ + ./ppp.pm-site.nix + ]; config = { boot.kernelPackages = pkgs.linuxPackages_latest; networking.hostName = "test-vm"; - mod = {}; + mod = { + pppdotpm-site.enable = true; + }; users.users.a = { isNormalUser = true; diff --git a/hosts/pinwheel/modules/ppp.pm-site/default.nix b/hosts/test-vm/ppp.pm-site.nix similarity index 56% rename from hosts/pinwheel/modules/ppp.pm-site/default.nix rename to hosts/test-vm/ppp.pm-site.nix index d0a72f4..8cb9eba 100644 --- a/hosts/pinwheel/modules/ppp.pm-site/default.nix +++ b/hosts/test-vm/ppp.pm-site.nix @@ -17,6 +17,20 @@ in domain = "ppp.pm.local"; }; - networking.extraHosts = "127.0.0.1 ppp.pm.local"; + networking = { + firewall.allowedTCPPorts = [ 80 ]; + }; + + virtualisation.vmVariant = { + virtualisation = { + forwardPorts = [ + { + from = "host"; + host.port = 8080; + guest.port = 80; + } + ]; + }; + }; }; }