From b56b0b82385281e0257e219832e8a307ac890ad0 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:30:26 +0200 Subject: [PATCH 1/3] robustirc-bridge: init at 1.8 --- pkgs/servers/irc/robustirc-bridge/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/irc/robustirc-bridge/default.nix diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix new file mode 100644 index 00000000000..430cbc3ccd1 --- /dev/null +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "robustirc-bridge"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "robustirc"; + repo = "bridge"; + rev = "v${version}"; + sha256 = "12jzil97147f978shdgm6whz7699db0shh0c1fzgrjh512dw502c"; + }; + + vendorSha256 = "0lm8j2iz0yysgi0bbh78ca629kb6sxvyy9al3aj2587hpvy79q85"; + + postInstall = '' + install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 + ''; + + meta = with stdenv.lib; { + description = "Bridge to robustirc.net-IRC-Network"; + homepage = "https://robustirc.net/"; + license = licenses.bsd3; + maintainers = [ maintainers.hax404 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a846a3f18..e2824bb1e77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22990,6 +22990,8 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; From 9376dd8516490f525f1ca0c188e40ba64f5c6b64 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:31:15 +0200 Subject: [PATCH 2/3] nixos/modules/robustirc-bridge: init --- nixos/modules/module-list.nix | 1 + .../services/networking/robustirc-bridge.nix | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/networking/robustirc-bridge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c837976286b..aec8dd5e29a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -719,6 +719,7 @@ ./services/networking/rdnssd.nix ./services/networking/redsocks.nix ./services/networking/resilio.nix + ./services/networking/robustirc-bridge.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix new file mode 100644 index 00000000000..255af79ec04 --- /dev/null +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.robustirc-bridge; +in +{ + options = { + services.robustirc-bridge = { + enable = mkEnableOption "RobustIRC bridge"; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = ''Extra flags passed to the robustirc-bridge command. See RobustIRC Documentation or robustirc-bridge(1) for details.''; + example = [ + "-network robustirc.net" + ]; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.robustirc-bridge = { + description = "RobustIRC bridge"; + documentation = [ + "man:robustirc-bridge(1)" + "https://robustirc.net/" + ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.robustirc-bridge}/bin/robustirc-bridge ${concatStringsSep " " cfg.extraFlags}"; + Restart = "on-failure"; + + # Hardening + PrivateDevices = true; + ProtectSystem = true; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; +} From 2bd6f0744fe78ef7150c493045bd3142df628a2a Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 30 Aug 2020 18:31:54 +0200 Subject: [PATCH 3/3] nixos/tests/robustirc-bridge: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/robustirc-bridge.nix | 29 +++++++++++++++++++ pkgs/servers/irc/robustirc-bridge/default.nix | 4 ++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/robustirc-bridge.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fabd525dd90..60ef5a02763 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -298,6 +298,7 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; + robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix new file mode 100644 index 00000000000..a5c22d73a34 --- /dev/null +++ b/nixos/tests/robustirc-bridge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "robustirc-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { bridge = + { services.robustirc-bridge = { + enable = true; + extraFlags = [ + "-listen localhost:6667" + "-network example.com" + ]; + }; + }; + }; + + testScript = + '' + start_all() + + bridge.wait_for_unit("robustirc-bridge.service") + bridge.wait_for_open_port(1080) + bridge.wait_for_open_port(6667) + ''; +}) diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index 430cbc3ccd1..84b80203f57 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; @@ -17,6 +17,8 @@ buildGoModule rec { install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 ''; + passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; + meta = with stdenv.lib; { description = "Bridge to robustirc.net-IRC-Network"; homepage = "https://robustirc.net/";