From 2d83fae67f13d5b351e614fcf88e2935ca30d21d Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 8 Oct 2023 12:13:38 -0400 Subject: [PATCH] Add fancyTypist.dev test Servant site --- .gitmodules | 3 +++ nixos-apps/fancyTypist.dev | 1 + nixos-apps/fancytypist.com.nix | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 160000 nixos-apps/fancyTypist.dev diff --git a/.gitmodules b/.gitmodules index b105de0..ab01da7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "nixos-apps/cutesealfanpage.love"] path = nixos-apps/cutesealfanpage.love url = gitea@git.ewanick.com:bill/seal-blog.git +[submodule "nixos-apps/fancyTypist.dev"] + path = nixos-apps/fancyTypist.dev + url = gitea@git.ewanick.com:bill/fancyTypist.dev.git diff --git a/nixos-apps/fancyTypist.dev b/nixos-apps/fancyTypist.dev new file mode 160000 index 0000000..1cd499e --- /dev/null +++ b/nixos-apps/fancyTypist.dev @@ -0,0 +1 @@ +Subproject commit 1cd499efa18470f4f1a9caa4033265c93bb5942b diff --git a/nixos-apps/fancytypist.com.nix b/nixos-apps/fancytypist.com.nix index acbf2f2..b6e73bd 100644 --- a/nixos-apps/fancytypist.com.nix +++ b/nixos-apps/fancytypist.com.nix @@ -1,3 +1,8 @@ +let + PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/fancytypist.dev"; + PORT = "12513"; + HOST = "localhost"; +in { services.caddy = { enable = true; @@ -19,9 +24,21 @@ "fancytypist.dev" = { serverAliases = [ "www.fancytypist.dev" ]; extraConfig = '' - respond "Hello, world! fancytypist.dev" + reverse_proxy ${HOST}:${PORT} ''; }; }; }; + + systemd.services = { + fancyTypist.dev-site = { + enable = true; + description = "The Haskell Servant executable server that hosts my FancyTypist.dev site."; + path = with pkgs; [ nix git ]; + script = '' + cd ${PROJECT_ROOT} + nix run .#fancyTypist.dev-site + ''; + }; + }; }