From 434420bd0a1a6e0b2d62cc17388ebf7cb6a7760e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 24 May 2021 16:21:20 +0200
Subject: solanum: remove unneeded BANDB stuff

---
 krebs/3modules/solanum.nix             |  3 ---
 krebs/5pkgs/simple/solanum/bandb.patch | 12 ------------
 krebs/5pkgs/simple/solanum/default.nix |  1 -
 3 files changed, 16 deletions(-)
 delete mode 100644 krebs/5pkgs/simple/solanum/bandb.patch

(limited to 'krebs')

diff --git a/krebs/3modules/solanum.nix b/krebs/3modules/solanum.nix
index 00aefce85..9094d1003 100644
--- a/krebs/3modules/solanum.nix
+++ b/krebs/3modules/solanum.nix
@@ -88,9 +88,6 @@ in
       systemd.services.solanum = {
         description = "Solanum IRC daemon";
         wantedBy = [ "multi-user.target" ];
-        environment = {
-          BANDB_DBPATH = "${cfg.statedir}/ban.db";
-        };
         serviceConfig = {
           ExecStart   = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile ${cfg.statedir}/ircd.pid";
           Group = cfg.group;
diff --git a/krebs/5pkgs/simple/solanum/bandb.patch b/krebs/5pkgs/simple/solanum/bandb.patch
deleted file mode 100644
index 7d204398b..000000000
--- a/krebs/5pkgs/simple/solanum/bandb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ircd/bandbi.c b/ircd/bandbi.c
-index 29a3bfa2..16a40f17 100644
---- a/ircd/bandbi.c
-+++ b/ircd/bandbi.c
-@@ -83,7 +83,6 @@ start_bandb(void)
- 	const char *suffix = "";
- #endif
- 
--	rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1);
- 	if(bandb_path == NULL)
- 	{
- 		snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);
diff --git a/krebs/5pkgs/simple/solanum/default.nix b/krebs/5pkgs/simple/solanum/default.nix
index 279cccbcc..3fa765c94 100644
--- a/krebs/5pkgs/simple/solanum/default.nix
+++ b/krebs/5pkgs/simple/solanum/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./dont-create-logdir.patch
-    ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
   ];
 
   configureFlags = [
-- 
cgit v1.2.3