git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #125019 from mweinelt/solanum
commit32b767b57eb02d0dcd3bf34e7dc5d6cb6f8a7c54 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateWed 16 Jun 2021, 01:48 (5 years ago) parent75130d42441e82
2 files changed+11−3
nixos/modules/services/networking/solanum.nix+10−2 pkgs/servers/irc/solanum/default.nix+1−1
nixos/modules/services/networking/solanum.nix+10−2
@@ -2,7 +2,7 @@
22
33let
44 inherit (lib) mkEnableOption mkIf mkOption types;
5− inherit (pkgs) solanum;
5+ inherit (pkgs) solanum util-linux;
66 cfg = config.services.solanum;
77
88 configFile = pkgs.writeText "solanum.conf" cfg.config;
@@ -78,12 +78,20 @@ in
7878
7979 config = mkIf cfg.enable (lib.mkMerge [
8080 {
81+
82+ environment.etc."solanum/ircd.conf".source = configFile;
83+
8184 systemd.services.solanum = {
8285 description = "Solanum IRC daemon";
8386 after = [ "network.target" ];
8487 wantedBy = [ "multi-user.target" ];
88+ reloadIfChanged = true;
89+ restartTriggers = [
90+ configFile
91+ ];
8592 serviceConfig = {
86− ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid";
93+ ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile /etc/solanum/ircd.conf -pidfile /run/solanum/ircd.pid";
94+ ExecReload = "${util-linux}/bin/kill -HUP $MAINPID";
8795 DynamicUser = true;
8896 User = "solanum";
8997 StateDirectory = "solanum";
pkgs/servers/irc/solanum/default.nix+1−1
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
6161 meta = with lib; {
6262 description = "An IRCd for unified networks";
6363 homepage = "https://github.com/solanum-ircd/solanum";
64− license = licenses.gpl2Only;
64+ license = licenses.gpl2Plus;
6565 maintainers = with maintainers; [ hexa ];
6666 platforms = platforms.unix;
6767 };