public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127016 from mweinelt/21.05/solanum

Browse Source
This commit is contained in:
Martin Weinelt 2021-06-16 12:18:53 +02:00 committed by GitHub
commit b8780177a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/networking/solanum.nix
View File

@ -2,7 +2,7 @@
let let
inherit (lib) mkEnableOption mkIf mkOption types; inherit (lib) mkEnableOption mkIf mkOption types;
inherit (pkgs) solanum; inherit (pkgs) solanum util-linux;
cfg = config.services.solanum; cfg = config.services.solanum;
configFile = pkgs.writeText "solanum.conf" cfg.config; configFile = pkgs.writeText "solanum.conf" cfg.config;
@ -78,15 +78,20 @@ in
config = mkIf cfg.enable (lib.mkMerge [ config = mkIf cfg.enable (lib.mkMerge [
{ {
environment.etc."solanum/ircd.conf".source = configFile;
systemd.services.solanum = { systemd.services.solanum = {
description = "Solanum IRC daemon"; description = "Solanum IRC daemon";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { reloadIfChanged = true;
BANDB_DBPATH = "/var/lib/solanum/ban.db"; restartTriggers = [
}; configFile
];
serviceConfig = { serviceConfig = {
ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid"; ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile /etc/solanum/ircd.conf -pidfile /run/solanum/ircd.pid";
ExecReload = "${util-linux}/bin/kill -HUP $MAINPID";
DynamicUser = true; DynamicUser = true;
User = "solanum"; User = "solanum";
StateDirectory = "solanum"; StateDirectory = "solanum";

12
pkgs/servers/irc/solanum/bandb.patch
View File

@ -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);

3
pkgs/servers/irc/solanum/default.nix
View File

@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./dont-create-logdir.patch ./dont-create-logdir.patch
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
]; ];
postPatch = '' postPatch = ''
@ -62,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "An IRCd for unified networks"; description = "An IRCd for unified networks";
homepage = "https://github.com/solanum-ircd/solanum"; homepage = "https://github.com/solanum-ircd/solanum";
license = licenses.gpl2Only; license = licenses.gpl2Plus;
maintainers = with maintainers; [ hexa ]; maintainers = with maintainers; [ hexa ];
platforms = platforms.unix; platforms = platforms.unix;
}; };