diff --git a/modules/nixos/guests/projectSite/default.nix b/modules/nixos/guests/projectSite/default.nix index 228a2a1..f234c5e 100755 --- a/modules/nixos/guests/projectSite/default.nix +++ b/modules/nixos/guests/projectSite/default.nix @@ -23,7 +23,7 @@ in networking.firewall.allowedTCPPorts = [ 22 - 8080 + 80 ]; services.openssh = { @@ -44,15 +44,17 @@ in gateway = [ serviceCfg.interface.gate ]; }; }; + }; - services.website = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.miniserve}/bin/miniserve /etc/website --index index.html -p 8080"; - Restart = "always"; - }; - }; + services.caddy = { + enable = true; + virtualHosts.":80".extraConfig = '' + root * /etc/website + + file_server + + try_files {path} /index.html + ''; }; microvm = { @@ -66,6 +68,7 @@ in mac = serviceCfg.interface.mac; } ]; + shares = [ { source = "/nix/store"; @@ -81,7 +84,9 @@ in services.caddy = { enable = true; virtualHosts.${host}.extraConfig = '' - reverse_proxy ${serviceCfg.interface.ip}:8080 + reverse_proxy ${serviceCfg.interface.ip}:80 + + tls /var/lib/acme/${host}/fullchain.pem /var/lib/acme/${host}/key.pem ''; };