diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index 23410fe..91f6bd6 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,9 +1,10 @@ -{ emanote, ... }: +{ pkgs, ... }: let PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; PORT = "5567"; HOST = "localhost"; + emanote-version = "1.2.0"; in { services.caddy = { @@ -22,12 +23,10 @@ in ewanick-site = { enable = true; description = "A blog powered by Emanote running solely on Markdown files."; - path = [ emanote ]; + path = with pkgs; [ nix git ]; script = '' cd ${PROJECT_ROOT} - emanote run \ - --port ${PORT} \ - --host ${HOST} + nix run github:srid/emanote/${emanote-version} -- run --port ${PORT} --host ${HOST} ''; }; }; diff --git a/nixos-apps/fancytypist.com.nix b/nixos-apps/fancytypist.com.nix index 5aed65d..0f6dcf8 100644 --- a/nixos-apps/fancytypist.com.nix +++ b/nixos-apps/fancytypist.com.nix @@ -2,8 +2,8 @@ let PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/fancyTypist.dev"; - PORT = "12513"; HOST = "localhost"; + PORT = 12513; in { services.caddy = { @@ -38,7 +38,7 @@ in "fancytypist.dev" = { serverAliases = [ "www.fancytypist.dev" ]; extraConfig = '' - reverse_proxy ${HOST}:${PORT} + reverse_proxy ${HOST}:${toString PORT} ''; }; };