diff options
| author | Brian Picciano <mediocregopher@gmail.com> | 2022-05-14 21:28:33 -0600 |
|---|---|---|
| committer | Brian Picciano <mediocregopher@gmail.com> | 2022-05-14 21:28:33 -0600 |
| commit | af08122a253916c9f7d923b6a0197db1cbbf536e (patch) | |
| tree | 7c20635d8e1475202cd58e394d1df58632c9367c /default.nix | |
| parent | e24dd6d630cf558c616c1252bacfff6d343b4194 (diff) | |
Add static serve back to dev-shell
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/default.nix b/default.nix index 93ba9d8..8d20c38 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ }) {}, baseConfig ? import ./config.nix, - skipServices ? [], + baseSkipServices ? [], }: rec { @@ -17,6 +17,12 @@ redisListenPath = "${config.runDir}/redis"; }; + skipServices = baseSkipServices ++ ( + if baseConfig.staticProxyURL == "" + then [ "static" ] + else [] + ); + static = (import ./static) { inherit pkgs; }; srv = pkgs.callPackage (import ./srv) { @@ -53,6 +59,13 @@ numprocesses = 1 ''; + staticCircusCfg = '' + [watcher:static] + cmd = ${static.serve}/bin/static-serve + numprocesses = 1 + working_dir = ./static + ''; + circusCfg = pkgs.writeText "mediocre-blog-circusCfg" '' [circus] endpoint = tcp://127.0.0.1:0 @@ -61,6 +74,8 @@ ${if (!builtins.elem "srv" skipServices) then srvCircusCfg else ""} ${if (!builtins.elem "redis" skipServices) then redisCircusCfg else ""} + + ${if (!builtins.elem "static" skipServices) then staticCircusCfg else ""} ''; entrypoint = pkgs.writeScript "mediocre-blog-entrypoint" '' |