solanum: use upstream service

This commit is contained in:
lassulus 2021-10-24 18:25:11 +02:00
parent 566951d3f0
commit 4fa8f74fc0
3 changed files with 3 additions and 108 deletions

View File

@ -1,13 +1,13 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
{ {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
6667 6669 6667 6669
]; ];
systemd.services.solanum.serviceConfig.LimitNOFILE = 16384; systemd.services.solanum.serviceConfig.LimitNOFILE = lib.mkForce 16384;
krebs.solanum = { services.solanum = {
enable = true; enable = true;
motd = '' motd = ''
hello hello

View File

@ -50,7 +50,6 @@ let
./secret.nix ./secret.nix
./setuid.nix ./setuid.nix
./shadow.nix ./shadow.nix
./solanum.nix
./sync-containers.nix ./sync-containers.nix
./tinc.nix ./tinc.nix
./tinc_graphs.nix ./tinc_graphs.nix

View File

@ -1,104 +0,0 @@
{ 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" ];
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;
})
]);
}