diff options
| author | Brian Picciano <mediocregopher@gmail.com> | 2022-05-20 13:37:43 -0600 |
|---|---|---|
| committer | Brian Picciano <mediocregopher@gmail.com> | 2022-05-20 13:37:43 -0600 |
| commit | 16cfbd19157df76e7296dddb287412f1099feb33 (patch) | |
| tree | e4bbf892066cceeaeeaee4c25e5365152412a1c3 /default.nix | |
| parent | 3cdee89c961ae9c836234f5aec87174a04a800a8 (diff) | |
Move static assets to within srv
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/default.nix b/default.nix index 8d20c38..f810fc6 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ }) {}, baseConfig ? import ./config.nix, - baseSkipServices ? [], + skipServices ? [], }: rec { @@ -17,17 +17,8 @@ redisListenPath = "${config.runDir}/redis"; }; - skipServices = baseSkipServices ++ ( - if baseConfig.staticProxyURL == "" - then [ "static" ] - else [] - ); - - static = (import ./static) { inherit pkgs; }; - srv = pkgs.callPackage (import ./srv) { inherit config; - staticBuild=static.build; }; redisCfg = pkgs.writeText "mediocre-blog-redisCfg" '' @@ -59,13 +50,6 @@ 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 @@ -74,8 +58,6 @@ ${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" '' |