From 16cfbd19157df76e7296dddb287412f1099feb33 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Fri, 20 May 2022 13:37:43 -0600
Subject: Move static assets to within srv

---
 default.nix | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'default.nix')

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" ''
-- 
cgit v1.2.3