From c64c97ac80d9f919573c8396cd3522a9bf0b0444 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 May 2021 12:06:09 +0200 Subject: nixpkgs: d90df56 -> 21ff930 --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 1d1dee220..7a16fab63 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "d90df566caff6ef84f7bfccc2a2c95496f221d62", - "date": "2021-05-04T18:59:22-04:00", - "path": "/nix/store/3jr3hwykb05r9m5g3phpx6f7k2956ny3-nixpkgs", - "sha256": "0f1im9c83kyc465k5lsqyhb5saki3dgh5bb1gyyh7gmqlhyvqcax", + "rev": "21ff9308b75d448765f7c3704a1459a3d8e1c844", + "date": "2021-05-14T13:57:54+00:00", + "path": "/nix/store/xdd7c619y10n0fll9zk32fzd62yhil90-nixpkgs", + "sha256": "0i32d1q5v9a0q4y1s010afn6vxljbliilq5cs63mk6sdw3kryj2b", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 7e018afe85af22916f070a242d9d1667791e3457 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 May 2021 12:18:22 +0200 Subject: nixpkgs-unstable: 39e6bf7 -> d1601a4 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 83ae57a6f..da50df9c9 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "39e6bf76474ce742eb027a88c4da6331f0a1526f", - "date": "2021-05-04T23:07:42+02:00", - "path": "/nix/store/9zbih9x2pfi782vv73v0vjxscmzyf4da-nixpkgs", - "sha256": "1pxigbywdq4yf7smas6zq4vhakbkvm1vhj443qjikh77fc8hy17b", + "rev": "d1601a40c48426ae460eede1675fd1d6ee23e198", + "date": "2021-05-13T06:19:30-04:00", + "path": "/nix/store/6ifpfakc5am0dz25w40y2jgr4jhvr3iz-nixpkgs", + "sha256": "00nl5b0ncqrcv6zr000dxk1jdvs7aj4s53njiyrh3sn78w1nghl6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From f1c47ae668eb3fa47a8c4ea952b81c9a909391a4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 May 2021 23:59:03 +0200 Subject: solanum: init at 2021-04-27 --- krebs/5pkgs/simple/solanum/bandb.patch | 12 +++++ krebs/5pkgs/simple/solanum/default.nix | 63 ++++++++++++++++++++++ .../5pkgs/simple/solanum/dont-create-logdir.patch | 14 +++++ 3 files changed, 89 insertions(+) create mode 100644 krebs/5pkgs/simple/solanum/bandb.patch create mode 100644 krebs/5pkgs/simple/solanum/default.nix create mode 100644 krebs/5pkgs/simple/solanum/dont-create-logdir.patch (limited to 'krebs') diff --git a/krebs/5pkgs/simple/solanum/bandb.patch b/krebs/5pkgs/simple/solanum/bandb.patch new file mode 100644 index 000000000..7d204398b --- /dev/null +++ b/krebs/5pkgs/simple/solanum/bandb.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..279cccbcc --- /dev/null +++ b/krebs/5pkgs/simple/solanum/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, bison +, flex +, openssl +, sqlite +, lksctp-tools +}: + +stdenv.mkDerivation rec { + pname = "solanum"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "solanum-ircd"; + repo = pname; + rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925"; + sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f"; + }; + + patches = [ + ./dont-create-logdir.patch + ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 + ]; + + configureFlags = [ + "--enable-epoll" + "--enable-ipv6" + "--enable-openssl=${openssl.dev}" + "--with-program-prefix=solanum-" + "--localstatedir=/var/lib" + "--with-rundir=/run" + "--with-logdir=/var/log" + ] ++ lib.optionals (stdenv.isLinux) [ + "--enable-sctp=${lksctp-tools.out}/lib" + ]; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + ]; + + buildInputs = [ + openssl + sqlite + ]; + + doCheck = !stdenv.isDarwin; + + enableParallelBuilding = true; + + meta = with lib; { + description = "An IRCd for unified networks"; + homepage = "https://github.com/solanum-ircd/solanum"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.unix; + }; +} diff --git a/krebs/5pkgs/simple/solanum/dont-create-logdir.patch b/krebs/5pkgs/simple/solanum/dont-create-logdir.patch new file mode 100644 index 000000000..e348dd7b8 --- /dev/null +++ b/krebs/5pkgs/simple/solanum/dont-create-logdir.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile.am b/Makefile.am +index 19e7b396..21093521 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,9 +35,6 @@ include/serno.h: + echo '#define DATECODE 0UL' >>include/serno.h; \ + fi + +-install-data-hook: +- test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir} +- + install-exec-hook: + rm -f ${DESTDIR}${libdir}/*.la + rm -f ${DESTDIR}${moduledir}/*.la -- cgit v1.2.3 From 08cf800ccaadc9f266bf812274b773cbf598524a Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 May 2021 23:59:41 +0200 Subject: modules: charybdis -> solanum --- krebs/2configs/ircd.nix | 4 +- krebs/3modules/charybdis.nix | 109 ------------------------------------------- krebs/3modules/default.nix | 2 +- krebs/3modules/solanum.nix | 107 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 112 deletions(-) delete mode 100644 krebs/3modules/charybdis.nix create mode 100644 krebs/3modules/solanum.nix (limited to 'krebs') diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix index 3ef2e7d2b..d4ac9e42a 100644 --- a/krebs/2configs/ircd.nix +++ b/krebs/2configs/ircd.nix @@ -5,9 +5,9 @@ 6667 6669 ]; - systemd.services.charybdis.serviceConfig.LimitNOFILE = 16384; + systemd.services.solanum.serviceConfig.LimitNOFILE = 16384; - krebs.charybdis = { + krebs.solanum = { enable = true; motd = '' hello diff --git a/krebs/3modules/charybdis.nix b/krebs/3modules/charybdis.nix deleted file mode 100644 index 038d79dd0..000000000 --- a/krebs/3modules/charybdis.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkEnableOption mkIf mkOption singleton types; - inherit (pkgs) coreutils charybdis; - cfg = config.krebs.charybdis; - - configFile = pkgs.writeText "charybdis.conf" '' - ${cfg.config} - ''; -in - -{ - - ###### interface - - options = { - - krebs.charybdis = { - - enable = mkEnableOption "Charybdis IRC daemon"; - - config = mkOption { - type = types.str; - description = '' - Charybdis IRC daemon configuration file. - ''; - }; - - statedir = mkOption { - type = types.str; - default = "/var/lib/charybdis"; - description = '' - Location of the state directory of charybdis. - ''; - }; - - user = mkOption { - type = types.str; - default = "ircd"; - description = '' - Charybdis IRC daemon user. - ''; - }; - - group = mkOption { - type = types.str; - default = "ircd"; - description = '' - Charybdis IRC daemon group. - ''; - }; - - motd = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Charybdis MOTD text. - - Charybdis will read its MOTD from /etc/charybdis/ircd.motd . - If set, the value of this option will be written to this path. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable (lib.mkMerge [ - { - users.users.${cfg.user} = { - description = "Charybdis IRC daemon user"; - uid = config.ids.uids.ircd; - group = cfg.group; - }; - - users.groups.${cfg.group} = { - name = cfg.group; - gid = config.ids.gids.ircd; - }; - - systemd.services.charybdis = { - description = "Charybdis IRC daemon"; - wantedBy = [ "multi-user.target" ]; - environment = { - BANDB_DBPATH = "${cfg.statedir}/ban.db"; - }; - serviceConfig = { - ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}"; - Group = cfg.group; - User = cfg.user; - PermissionsStartOnly = true; # preStart needs to run with root permissions - }; - preStart = '' - ${coreutils}/bin/mkdir -p ${cfg.statedir} - ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} - ''; - }; - - } - - (mkIf (cfg.motd != null) { - environment.etc."charybdis/ircd.motd".text = cfg.motd; - }) - ]); -} diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 85d27459b..e75afad1d 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -17,7 +17,6 @@ let ./buildbot/slave.nix ./build.nix ./cachecache.nix - ./charybdis.nix ./ci.nix ./current.nix ./dns.nix @@ -52,6 +51,7 @@ let ./secret.nix ./setuid.nix ./shadow.nix + ./solanum.nix ./sync-containers.nix ./tinc.nix ./tinc_graphs.nix diff --git a/krebs/3modules/solanum.nix b/krebs/3modules/solanum.nix new file mode 100644 index 000000000..00aefce85 --- /dev/null +++ b/krebs/3modules/solanum.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption singleton types; + inherit (pkgs) coreutils solanum; + cfg = config.krebs.solanum; + + configFile = pkgs.writeText "solanum.conf" '' + ${cfg.config} + ''; +in + +{ + + ###### interface + + options = { + + krebs.solanum = { + + enable = mkEnableOption "Solanum IRC daemon"; + + config = mkOption { + type = types.str; + description = '' + Solanum IRC daemon configuration file. + ''; + }; + + statedir = mkOption { + type = types.path; + default = "/var/lib/solanum"; + description = '' + Location of the state directory of solanum. + ''; + }; + + user = mkOption { + type = types.str; + default = "ircd"; + description = '' + Solanum IRC daemon user. + ''; + }; + + group = mkOption { + type = types.str; + default = "ircd"; + description = '' + Solanum IRC daemon group. + ''; + }; + + motd = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Solanum MOTD text. + + Solanum will read its MOTD from /etc/solanum/ircd.motd . + If set, the value of this option will be written to this path. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable (lib.mkMerge [ + { + users.users.${cfg.user} = { + description = "Solanum IRC daemon user"; + uid = config.ids.uids.ircd; + group = cfg.group; + }; + + users.groups.${cfg.group} = { + gid = config.ids.gids.ircd; + }; + + systemd.tmpfiles.rules = [ + "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -" + ]; + + 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; + User = cfg.user; + }; + }; + + } + + (mkIf (cfg.motd != null) { + environment.etc."solanum/ircd.motd".text = cfg.motd; + }) + ]); +} -- cgit v1.2.3 From 91dfd62908390dcc38b92545eb18f4dccf50bcbb Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 19 May 2021 23:26:59 +0200 Subject: nixpkgs: 52090c6 -> 33824cd --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 7a16fab63..06b865cc8 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "21ff9308b75d448765f7c3704a1459a3d8e1c844", - "date": "2021-05-14T13:57:54+00:00", - "path": "/nix/store/xdd7c619y10n0fll9zk32fzd62yhil90-nixpkgs", - "sha256": "0i32d1q5v9a0q4y1s010afn6vxljbliilq5cs63mk6sdw3kryj2b", + "rev": "33824cdf8e4fec30c5b9ddc91b18991c3c375227", + "date": "2021-05-18T19:08:44-04:00", + "path": "/nix/store/s3f1q2a5hn60jdnz8h66z7yahrmzifin-nixpkgs", + "sha256": "1sad0x998k3iid2vp57kv4skvf90yh4gbs61dv3p45c2qi3sql46", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From ef5f81839f1a596b7b836a032e5b11d3f791cffb Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 19 May 2021 23:27:20 +0200 Subject: nixpkgs-unstable: 83d907f -> 7a1fbc3 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index da50df9c9..fe46ec022 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "d1601a40c48426ae460eede1675fd1d6ee23e198", - "date": "2021-05-13T06:19:30-04:00", - "path": "/nix/store/6ifpfakc5am0dz25w40y2jgr4jhvr3iz-nixpkgs", - "sha256": "00nl5b0ncqrcv6zr000dxk1jdvs7aj4s53njiyrh3sn78w1nghl6", + "rev": "7a1fbc38a4b538450ac0d42aec8a3e513b4d723e", + "date": "2021-05-16T12:16:31+02:00", + "path": "/nix/store/iq2sy65gmwad2prm8lcdh6k5f7ywxci5-nixpkgs", + "sha256": "0jg8dilsw0gr4jfshkk3wd50gddd11hvd836fxkw43m6m47885p7", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/57200000.lock: No such file or directory (2)