Merge remote-tracking branch 'ni/master'
This commit is contained in:
lassulus
commit
bfa577817e
|
|
@ -23,32 +23,20 @@ with import <stockholm/lib>;
|
|||
};
|
||||
|
||||
config.environment.etc = mkIf (config.krebs.iana-etc.services != {}) {
|
||||
services.source = mkForce (pkgs.runCommand "krebs-iana-etc" {} ''
|
||||
exec < ${pkgs.iana_etc}/etc/services
|
||||
exec > $out
|
||||
awk -F '[ /]+' '
|
||||
BEGIN {
|
||||
port=0
|
||||
}
|
||||
${concatMapStringsSep "\n" (entry: ''
|
||||
$2 == ${entry.port} {
|
||||
port=$2
|
||||
next
|
||||
}
|
||||
port == ${entry.port} {
|
||||
${concatMapStringsSep "\n"
|
||||
(proto: let
|
||||
s = "${entry.${proto}.name} ${entry.port}/${proto}";
|
||||
in
|
||||
"print ${toJSON s}")
|
||||
(filter (proto: entry.${proto} != null) ["tcp" "udp"])}
|
||||
port=0
|
||||
}
|
||||
'') (attrValues config.krebs.iana-etc.services)}
|
||||
{
|
||||
print $0
|
||||
}
|
||||
'
|
||||
services.source = mkForce (pkgs.runCommand "krebs-iana-etc" {} /* sh */ ''
|
||||
{
|
||||
${concatMapStringsSep "\n" (entry: /* sh */ ''
|
||||
${concatMapStringsSep "\n"
|
||||
(proto: let
|
||||
line = "${entry.${proto}.name} ${entry.port}/${proto}";
|
||||
in /* sh */ ''
|
||||
echo ${shell.escape line}
|
||||
'')
|
||||
(filter (proto: entry.${proto} != null) ["tcp" "udp"])}
|
||||
'') (attrValues config.krebs.iana-etc.services)}
|
||||
cat ${pkgs.iana_etc}/etc/services
|
||||
} |
|
||||
sort -b -k 2,2 -u > $out
|
||||
'');
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 53dfb30af324408c34fc7f664a05992e186ca4e9
|
||||
Subproject commit f2f8cbf1afcb2c26d11e5f82c0b523b2cb10205c
|
||||
|
|
@ -8,7 +8,6 @@ with import <stockholm/lib>;
|
|||
<stockholm/tv/2configs/hw/x220.nix>
|
||||
<stockholm/tv/2configs/exim-retiolum.nix>
|
||||
<stockholm/tv/2configs/gitrepos.nix>
|
||||
<stockholm/tv/2configs/im.nix>
|
||||
<stockholm/tv/2configs/mail-client.nix>
|
||||
<stockholm/tv/2configs/nginx/public_html.nix>
|
||||
<stockholm/tv/2configs/pulse.nix>
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
with import <stockholm/lib>;
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
(pkgs.writeDashBin "im" ''
|
||||
export PATH=${makeSearchPath "bin" (with pkgs; [
|
||||
tmux
|
||||
gnugrep
|
||||
weechat
|
||||
])}
|
||||
if tmux list-sessions -F\#S | grep -q '^im''$'; then
|
||||
exec tmux attach -t im
|
||||
else
|
||||
exec tmux new -s im weechat
|
||||
fi
|
||||
'')
|
||||
];
|
||||
services.bitlbee = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
pkgs.bitlbee-facebook
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
./ejabberd
|
||||
./focus.nix
|
||||
./hosts.nix
|
||||
./im.nix
|
||||
./iptables.nix
|
||||
./slock.nix
|
||||
./x0vncserver.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
{ config, pkgs, ... }: let
|
||||
im = config.tv.im;
|
||||
lib = import <stockholm/lib>;
|
||||
in {
|
||||
options = {
|
||||
tv.im.client.enable = lib.mkEnableOption "tv.im.client" // {
|
||||
default = config.krebs.build.host.name == im.client.host.name;
|
||||
};
|
||||
tv.im.client.term = lib.mkOption {
|
||||
default = "rxvt-unicode-256color";
|
||||
type = lib.types.filename;
|
||||
};
|
||||
tv.im.client.useIPv6 = lib.mkEnableOption "tv.im.client.useIPv6" // {
|
||||
default = true;
|
||||
};
|
||||
tv.im.client.host = lib.mkOption {
|
||||
default = config.krebs.hosts.xu;
|
||||
type = lib.types.host;
|
||||
};
|
||||
tv.im.client.user = lib.mkOption {
|
||||
default = config.krebs.users.tv;
|
||||
type = lib.types.user;
|
||||
};
|
||||
|
||||
tv.im.server.enable = lib.mkEnableOption "tv.im.server" // {
|
||||
default = config.krebs.build.host.name == im.server.host.name;
|
||||
};
|
||||
tv.im.server.host = lib.mkOption {
|
||||
default = config.krebs.hosts.nomic;
|
||||
type = lib.types.host;
|
||||
};
|
||||
tv.im.server.mosh.enable = lib.mkEnableOption "tv.im.server.mosh" // {
|
||||
default = true;
|
||||
};
|
||||
tv.im.server.weechat.relay.enable =
|
||||
lib.mkEnableOption "tv.im.server.weechat.relay";
|
||||
tv.im.server.user = lib.mkOption {
|
||||
default = config.krebs.users.tv;
|
||||
type = lib.types.user;
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
(lib.mkIf im.client.enable {
|
||||
users.users.${im.client.user.name}.packages = [
|
||||
(pkgs.writeDashBin "im" ''
|
||||
${if im.server.mosh.enable then /* sh */ ''
|
||||
exec ${pkgs.mosh}/bin/mosh \
|
||||
${lib.optionalString im.client.useIPv6 "-6"} \
|
||||
${im.server.user.name}@${lib.head im.server.host.nets.retiolum.aliases} \
|
||||
env TERM=${im.client.term} im
|
||||
'' else /* sh */ ''
|
||||
exec ${pkgs.openssh}/bin/ssh \
|
||||
${lib.optionalString im.client.useIPv6 "-6"} \
|
||||
${im.server.user.name}@${lib.head im.server.host.nets.retiolum.aliases} \
|
||||
-t \
|
||||
im
|
||||
''}
|
||||
'')
|
||||
];
|
||||
})
|
||||
(lib.mkIf im.server.enable {
|
||||
services.bitlbee = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
pkgs.bitlbee-facebook
|
||||
];
|
||||
};
|
||||
users.users.${im.server.user.name}.packages = [
|
||||
pkgs.mosh
|
||||
(pkgs.writeDashBin "im" ''
|
||||
export PATH=${lib.makeSearchPath "bin" [
|
||||
pkgs.tmux
|
||||
pkgs.gnugrep
|
||||
pkgs.weechat
|
||||
]}
|
||||
if tmux list-sessions -F\#S | grep -q '^im''$'; then
|
||||
exec tmux attach -t im
|
||||
else
|
||||
exec tmux new -s im weechat
|
||||
fi
|
||||
'')
|
||||
];
|
||||
})
|
||||
(lib.mkIf im.server.mosh.enable {
|
||||
krebs.setuid.utempter = {
|
||||
filename = "${pkgs.libutempter}/lib/utempter/utempter";
|
||||
owner = "nobody";
|
||||
group = "utmp";
|
||||
mode = "2111";
|
||||
};
|
||||
tv.iptables.extra4.filter.Retiolum = [
|
||||
"-s ${im.client.host.nets.retiolum.ip4.addr} -p udp --dport 60000:61000 -j ACCEPT"
|
||||
];
|
||||
tv.iptables.extra6.filter.Retiolum = [
|
||||
"-s ${im.client.host.nets.retiolum.ip6.addr} -p udp --dport 60000:61000 -j ACCEPT"
|
||||
];
|
||||
})
|
||||
(lib.mkIf im.server.weechat.relay.enable {
|
||||
krebs.iana-etc.services = {
|
||||
"9001".tcp.name = "weechat-ssl";
|
||||
};
|
||||
tv.iptables.extra4.filter.Retiolum = [
|
||||
"-s ${im.client.host.nets.retiolum.ip4.addr} -p tcp -m tcp --dport 9001 -j ACCEPT"
|
||||
];
|
||||
tv.iptables.extra6.filter.Retiolum = [
|
||||
"-s ${im.client.host.nets.retiolum.ip6.addr} -p tcp -m tcp --dport 9001 -j ACCEPT"
|
||||
];
|
||||
})
|
||||
];
|
||||
}
|
||||
Loading…
Reference in New Issue