From 323f1bdf5d3a139a762d07c7a6a74654af1a6aec Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 30 May 2021 11:13:41 -0400 Subject: [PATCH] run redis on chrysalis for now Signed-off-by: Christine Dodrill --- cmd/waifud/main.go | 2 +- scripts/start-redis.sh | 8 -------- shell.nix | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 10 deletions(-) delete mode 100755 scripts/start-redis.sh diff --git a/cmd/waifud/main.go b/cmd/waifud/main.go index 5df29de..5b4cb3e 100644 --- a/cmd/waifud/main.go +++ b/cmd/waifud/main.go @@ -13,7 +13,7 @@ var ( network = flag.String("network", "tcp", "network protocol to bind the local HTTP server on") bind = flag.String("bind", "127.0.0.1:39294", "thing to bind the local HTTP server on") zvolPrefix = flag.String("zvol-prefix", "rpool/waifud", "the prefix to use for zvol names") - redisURL = flag.String("redis-url", "redis://127.0.0.1", "the url to dial out to Redis") + redisURL = flag.String("redis-url", "redis://chrysalis", "the url to dial out to Redis") ) func main() { diff --git a/scripts/start-redis.sh b/scripts/start-redis.sh deleted file mode 100755 index 27be648..0000000 --- a/scripts/start-redis.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker run \ - --name waifud-redis \ - -p 6379:6379 \ - --restart always \ - -d \ - redis:6.3.2 diff --git a/shell.nix b/shell.nix index dece8a3..5791a70 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,19 @@ { pkgs ? import { } }: pkgs.mkShell { - buildInputs = with pkgs; [ dhall dhall-json go goimports gopls cdrkit jq ]; + buildInputs = with pkgs; [ + # dhall + dhall + dhall-json + + # go + go + goimports + gopls + + # other tools + cdrkit + jq + redis + ]; }