remove redis and circus

1 files changed, 4 insertions, 49 deletions

diff --git a/default.nix b/default.nix
index f810fc6..98efd74 100644
--- a/default.nix
+++ b/default.nix
@@ -6,71 +6,26 @@
         sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
     }) {},
 
-    baseConfig ? import ./config.nix,
-    skipServices ? [],
+    config ? import ./config.nix,
 
 }: rec {
 
     pkgs = pkgsArg;
 
-    config = baseConfig // {
-        redisListenPath = "${config.runDir}/redis";
-    };
-
     srv = pkgs.callPackage (import ./srv) {
         inherit config;
     };
 
-    redisCfg = pkgs.writeText "mediocre-blog-redisCfg" ''
-        port 0
-        unixsocket ${config.redisListenPath}
-        daemonize no
-        loglevel notice
-        logfile ""
-        appendonly yes
-        appendfilename "appendonly.aof"
-        dir ${config.dataDir}/redis
-    '';
-
-    redisBin = pkgs.writeScript "mediocre-blog-redisBin" ''
-        #!/bin/sh
-        mkdir -p ${config.dataDir}/redis
-        exec ${pkgs.redis}/bin/redis-server ${redisCfg}
-    '';
-
-    srvCircusCfg = ''
-        [watcher:srv]
-        cmd = ${srv.bin}
-        numprocesses = 1
-    '';
-
-    redisCircusCfg = ''
-        [watcher:redis]
-        cmd = ${redisBin}
-        numprocesses = 1
-    '';
-
-    circusCfg = pkgs.writeText "mediocre-blog-circusCfg" ''
-        [circus]
-        endpoint = tcp://127.0.0.1:0
-        pubsub_endpoint = tcp://127.0.0.1:0
-
-        ${if (!builtins.elem "srv" skipServices) then srvCircusCfg else ""}
-
-        ${if (!builtins.elem "redis" skipServices) then redisCircusCfg else ""}
-    '';
 
     entrypoint = pkgs.writeScript "mediocre-blog-entrypoint" ''
         #!/bin/sh
 
         set -e
 
-        if [ ! -d ${config.runDir} ]; then
-          mkdir -p ${config.runDir}
-        fi
-
+        mkdir -p ${config.runDir}
         mkdir -p ${config.dataDir}
-        exec ${pkgs.circus}/bin/circusd ${circusCfg}
+
+        exec ${srv.bin}
     '';
 
     service = pkgs.writeText "mediocre-blog" ''