Merge branch 'master' of prism:stockholm

This commit is contained in:
makefu 2017-07-23 10:23:40 +02:00
commit 3ee48434e3
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
20 changed files with 327 additions and 226 deletions

View File

@ -102,7 +102,13 @@ ifneq ($(ssh),)
populate: populate-flags += --ssh=$(ssh) populate: populate-flags += --ssh=$(ssh)
endif endif
populate: populate:
$(call evaluate,config.krebs.build.source) --json --strict | \ nix-instantiate \
--eval \
--json \
--readonly-mode \
--show-trace \
--strict \
$(LOGNAME)/1systems/$(system)/source.nix | \
populate $(populate-target) $(populate-flags) populate $(populate-target) $(populate-flags)
# usage: make pkgs.populate # usage: make pkgs.populate

View File

@ -5,6 +5,9 @@
<stockholm/krebs> <stockholm/krebs>
<stockholm/krebs/2configs> <stockholm/krebs/2configs>
<stockholm/krebs/2configs/secret-passwords.nix> <stockholm/krebs/2configs/secret-passwords.nix>
<stockholm/krebs/2configs/repo-sync.nix>
<stockholm/krebs/2configs/shared-buildbot.nix>
]; ];
krebs.build.host = config.krebs.hosts.puyak; krebs.build.host = config.krebs.hosts.puyak;
@ -27,6 +30,11 @@
"/boot" = { "/boot" = {
device = "/dev/sda2"; device = "/dev/sda2";
}; };
"/bku" = {
device = "/dev/mapper/pool-bku";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
"/home" = { "/home" = {
device = "/dev/mapper/pool-home"; device = "/dev/mapper/pool-home";
fsType = "btrfs"; fsType = "btrfs";

View File

@ -11,7 +11,6 @@ in
<stockholm/krebs/2configs/central-stats-client.nix> <stockholm/krebs/2configs/central-stats-client.nix>
<stockholm/krebs/2configs/save-diskspace.nix> <stockholm/krebs/2configs/save-diskspace.nix>
<stockholm/krebs/2configs/cgit-mirror.nix>
<stockholm/krebs/2configs/graphite.nix> <stockholm/krebs/2configs/graphite.nix>
<stockholm/krebs/2configs/repo-sync.nix> <stockholm/krebs/2configs/repo-sync.nix>
<stockholm/krebs/2configs/shared-buildbot.nix> <stockholm/krebs/2configs/shared-buildbot.nix>

21
krebs/2configs/backup.nix Normal file
View File

@ -0,0 +1,21 @@
{ config, lib, ... }:
with import <stockholm/lib>;
{
krebs.backup.plans = {
} // mapAttrs (_: recursiveUpdate {
snapshots = {
daily = { format = "%Y-%m-%d"; retain = 7; };
weekly = { format = "%YW%W"; retain = 4; };
monthly = { format = "%Y-%m"; retain = 12; };
yearly = { format = "%Y"; };
};
}) {
wolf-share-puyak = {
method = "pull";
src = { host = config.krebs.hosts.wolf; path = "/home/share"; };
dst = { host = config.krebs.hosts.puyak; path = "/bku/wolf-share"; };
startAt = "03:00";
};
};
}

View File

@ -1,45 +0,0 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>;
let
rules = with git; singleton {
user = [ wolf-repo-sync ];
repo = [ stockholm-mirror ];
perm = push ''refs/*'' [ non-fast-forward create delete merge ];
};
stockholm-mirror = {
public = true;
name = "stockholm-mirror";
cgit.desc = "mirror for all stockholm branches";
hooks = {
post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName;
verbose = false;
channel = "#retiolum";
server = "ni.r";
};
};
};
wolf-repo-sync = {
name = "wolf-repo-sync";
mail = "spam@krebsco.de";
# TODO put git-sync pubkey somewhere more appropriate
pubkey = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwuAZB3wtAvBJFYh+gWdyGaZU4mtqM2dFXmh2rORlbXeh02msu1uv07ck1VKkQ4LgvCBcBsAOeVa1NTz99eLqutwgcqMCytvRNUCibcoEWwHObsK53KhDJj+zotwlFhnPPeK9+EpOP4ngh/tprJikttos5BwBwe2K+lfiid3fmVPZcTTYa77nCwijimMvWEx6CEjq1wiXMUc4+qcEn8Swbwomz/EEQdNE2hgoC3iMW9RqduTFdIJWnjVi0KaxenX9CvQRGbVK5SSu2gwzN59D/okQOCP6+p1gL5r3QRHSLSSRiEHctVQTkpKOifrtLZGSr5zArEmLd/cOVyssHQPCX repo-sync@wolf'';
};
in {
krebs.users.wolf-repo-sync = wolf-repo-sync;
krebs.git = {
enable = true;
cgit = {
settings = {
root-title = "Shared Repos";
root-desc = "keep on krebsing";
};
};
inherit rules;
repos.stockholm-mirror = stockholm-mirror;
};
}

View File

@ -2,6 +2,9 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
imports = [
./backup.nix
];
krebs.enable = true; krebs.enable = true;
krebs.tinc.retiolum.enable = true; krebs.tinc.retiolum.enable = true;

View File

@ -1,31 +1,80 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with import <stockholm/lib>;
{
krebs.repo-sync = let let
# TODO addMirrorURL function mirror = "git@${config.networking.hostName}:";
mirror = "git@wolf:stockholm-mirror";
defineRepo = name: announce: let
repo = {
public = true;
name = mkDefault "${name}";
cgit.desc = mkDefault "mirror for ${name}";
cgit.section = mkDefault "mirror";
hooks = mkIf announce (mkDefault {
post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName;
verbose = false;
channel = "#retiolum";
server = "ni.r";
branches = [ "newest" ];
};
});
};
in { in {
enable = true; rules = with git; singleton {
repos.stockholm = { user = with config.krebs.users; [
config.krebs.users."${config.networking.hostName}-repo-sync"
];
repo = [ repo ];
perm = push ''refs/*'' [ non-fast-forward create delete merge ];
};
repos."${name}" = repo;
};
sync-retiolum = name:
{
krebs.repo-sync.repos.${name} = {
branches = { branches = {
makefu = { makefu = {
origin.url = http://cgit.gum/stockholm ; origin.url = "http://cgit.gum/${name}";
mirror.url = mirror; mirror.url = "${mirror}${name}";
}; };
tv = { tv = {
origin.url = http://cgit.ni.r/stockholm; origin.url = "http://cgit.ni.r/${name}";
mirror.url = mirror; mirror.url = "${mirror}${name}";
};
nin = {
origin.url = "http://cgit.onondaga.r/${name}";
mirror.url = "${mirror}${name}";
}; };
lassulus = { lassulus = {
origin.url = http://cgit.prism/stockholm ; origin.url = "http://cgit.lassul.us/${name}";
mirror.url = mirror; mirror.url = "${mirror}${name}";
}; };
}; };
latest = { latest = {
url = mirror; url = "${mirror}${name}";
ref = "heads/master"; ref = "heads/newest";
};
};
krebs.git = defineRepo name true;
};
in {
krebs.repo-sync = {
enable = true;
};
krebs.git = {
enable = mkDefault true;
cgit = {
settings = {
root-title = "Shared Repos";
root-desc = "keep on krebsing";
}; };
}; };
}; };
imports = [
(sync-retiolum "stockholm")
];
} }

View File

@ -6,25 +6,29 @@
# krebs host like wolf and everything should be fine. # krebs host like wolf and everything should be fine.
# TODO for all users schedule a build for fast tests # TODO for all users schedule a build for fast tests
{ let
hostname = config.networking.hostName;
in {
# due to the fact that we actually build stuff on the box via the daemon, # due to the fact that we actually build stuff on the box via the daemon,
# /nix/store should be cleaned up automatically as well # /nix/store should be cleaned up automatically as well
services.nginx.virtualHosts.build = { services.nginx = {
serverAliases = [ "build.wolf.r" ]; enable = true;
virtualHosts.build = {
serverAliases = [ "build.${hostname}.r" ];
locations."/".extraConfig = '' locations."/".extraConfig = ''
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass http://127.0.0.1:${toString config.krebs.buildbot.master.web.port}; proxy_pass http://127.0.0.1:${toString config.krebs.buildbot.master.web.port};
''; '';
}; };
};
nix.gc.automatic = true; nix.gc.automatic = true;
nix.gc.dates = "05:23"; nix.gc.dates = "05:23";
networking.firewall.allowedTCPPorts = [ 8010 9989 ]; networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
krebs.buildbot.master = let krebs.buildbot.master = let
stockholm-mirror-url = http://cgit.wolf.r/stockholm-mirror ; stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm" ;
in { in {
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
workers = { workers = {
testworker = "krebspass"; testworker = "krebspass";
}; };
@ -155,13 +159,13 @@
}; };
irc = { irc = {
enable = true; enable = true;
nick = "wolfbot"; nick = "${hostname}bot";
server = "ni.r"; server = "ni.r";
channels = [ { channel = "retiolum"; } ]; channels = [ { channel = "retiolum"; } ];
allowForce = true; allowForce = true;
}; };
extraConfig = '' extraConfig = ''
c['buildbotURL'] = "http://build.wolf.r/" c['buildbotURL'] = "http://build.${hostname}.r/"
''; '';
}; };
@ -173,6 +177,6 @@
packages = with pkgs; [ gnumake jq nix populate ]; packages = with pkgs; [ gnumake jq nix populate ];
# all nix commands will need a working nixpkgs installation # all nix commands will need a working nixpkgs installation
extraEnviron = { extraEnviron = {
NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/wolf/config.nix:stockholm=./"; }; NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/${hostname}/config.nix:stockholm=./"; };
}; };
} }

View File

@ -54,6 +54,12 @@ let
}; };
}); });
}; };
timerConfig = mkOption {
type = with types; attrsOf str;
default = optionalAttrs (config.startAt != null) {
OnCalendar = config.startAt;
};
};
}; };
})); }));
}; };
@ -82,11 +88,19 @@ let
SyslogIdentifier = ExecStart.name; SyslogIdentifier = ExecStart.name;
Type = "oneshot"; Type = "oneshot";
}; };
startAt = mkIf (plan.startAt != null) plan.startAt;
}) (filter (plan: build-host-is "pull" "dst" plan || }) (filter (plan: build-host-is "pull" "dst" plan ||
build-host-is "push" "src" plan) build-host-is "push" "src" plan)
enabled-plans)); enabled-plans));
systemd.timers =
listToAttrs (map (plan: nameValuePair "backup.${plan.name}" {
wantedBy = [ "timers.target" ];
timerConfig = plan.timerConfig;
}) (filter (plan: plan.timerConfig != {} && (
build-host-is "pull" "dst" plan ||
build-host-is "push" "src" plan))
enabled-plans));
users.groups.backup.gid = genid "backup"; users.groups.backup.gid = genid "backup";
users.users.root.openssh.authorizedKeys.keys = users.users.root.openssh.authorizedKeys.keys =
map (plan: getAttr plan.method { map (plan: getAttr plan.method {

View File

@ -49,6 +49,7 @@ let
set -euf set -euf
mkdir -p ${cfg.stateDir} mkdir -p ${cfg.stateDir}
chmod o+rx ${cfg.stateDir}
cd ${cfg.stateDir} cd ${cfg.stateDir}
(curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || : (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || :
feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper

View File

@ -569,7 +569,8 @@ let
if ! test -d "$repodir"; then if ! test -d "$repodir"; then
mkdir -m "$mode" "$repodir" mkdir -m "$mode" "$repodir"
git init --bare --template=/var/empty "$repodir" git init --bare --template=/var/empty "$repodir"
chown -R git:nogroup "$repodir" # TODO fix correctly with stringAfter
chown -R ${toString config.users.users.git.uid}:nogroup "$repodir"
fi fi
ln -s ${hooks} "$repodir/hooks" ln -s ${hooks} "$repodir/hooks"
'' ''

View File

@ -38,6 +38,8 @@ in {
ip6.addr = "42:0:0:0:0:0:77:2"; ip6.addr = "42:0:0:0:0:0:77:2";
aliases = [ aliases = [
"puyak.r" "puyak.r"
"build.puyak.r"
"cgit.puyak.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -94,5 +96,15 @@ in {
krebs = { krebs = {
pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary
}; };
puyak-repo-sync = {
name = "puyak-repo-sync";
mail = "spam@krebsco.de";
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+18mG/cV1YbR9PXzuu3ScyV9kENy08OXUntpmgh9H2";
};
wolf-repo-sync = {
name = "wolf-repo-sync";
mail = "spam@krebsco.de";
pubkey = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwuAZB3wtAvBJFYh+gWdyGaZU4mtqM2dFXmh2rORlbXeh02msu1uv07ck1VKkQ4LgvCBcBsAOeVa1NTz99eLqutwgcqMCytvRNUCibcoEWwHObsK53KhDJj+zotwlFhnPPeK9+EpOP4ngh/tprJikttos5BwBwe2K+lfiid3fmVPZcTTYa77nCwijimMvWEx6CEjq1wiXMUc4+qcEn8Swbwomz/EEQdNE2hgoC3iMW9RqduTFdIJWnjVi0KaxenX9CvQRGbVK5SSu2gwzN59D/okQOCP6+p1gL5r3QRHSLSSRiEHctVQTkpKOifrtLZGSr5zArEmLd/cOVyssHQPCX repo-sync@wolf'';
};
}; };
} }

View File

@ -102,7 +102,7 @@ prepare_nixos_iso() {
mkdir -p bin mkdir -p bin
rm -f bin/nixos-install rm -f bin/nixos-install
cp "$(type -p nixos-install)" bin/nixos-install cp "$(type -p nixos-install)" bin/nixos-install
sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
} }
get_nixos_install() { get_nixos_install() {

View File

@ -36,11 +36,11 @@
"/boot" = { "/boot" = {
device = "/dev/sda2"; device = "/dev/sda2";
}; };
#"/bku" = { "/bku" = {
# device = "/dev/mapper/pool-bku"; device = "/dev/mapper/pool-bku";
# fsType = "btrfs"; fsType = "btrfs";
# options = ["defaults" "noatime" "ssd" "compress=lzo"]; options = ["defaults" "noatime" "ssd" "compress=lzo"];
#}; };
"/home" = { "/home" = {
device = "/dev/mapper/pool-home"; device = "/dev/mapper/pool-home";
fsType = "btrfs"; fsType = "btrfs";

View File

@ -134,7 +134,7 @@ with import <stockholm/lib>;
startAt = "03:55"; startAt = "03:55";
}; };
icarus-home-mors = { icarus-home-mors = {
method = "push"; method = "pull";
src = { host = config.krebs.hosts.icarus; path = "/home"; }; src = { host = config.krebs.hosts.icarus; path = "/home"; };
dst = { host = config.krebs.hosts.mors; path = "/bku/icarus-home"; }; dst = { host = config.krebs.hosts.mors; path = "/bku/icarus-home"; };
startAt = "05:00"; startAt = "05:00";

View File

@ -47,10 +47,8 @@ let
''; '';
init.env = pkgs.writeText "init.env" /* sh */ '' init.env = pkgs.writeText "init.env" /* sh */ ''
config=''${config-$user/1systems/$system/config.nix}
source=''${source-$user/1systems/$system/source.nix} source=''${source-$user/1systems/$system/source.nix}
export config
export source export source
export system export system
export target export target
@ -98,7 +96,6 @@ let
--readonly-mode \ --readonly-mode \
--show-trace \ --show-trace \
--strict \ --strict \
-I nixos-config="$config" \
"$source") "$source")
echo $_source | echo $_source |
${pkgs.populate}/bin/populate \ ${pkgs.populate}/bin/populate \
@ -118,7 +115,6 @@ let
STOCKHOLM_VERSION=$STOCKHOLM_VERSION \ STOCKHOLM_VERSION=$STOCKHOLM_VERSION \
nix-shell \ nix-shell \
--run $(q \ --run $(q \
config=$config \
system=$system \ system=$system \
target=$target \ target=$target \
using_proxy=true \ using_proxy=true \

View File

@ -1,93 +1,129 @@
{ config, ... }: with import <stockholm/lib>; let with import <stockholm/lib>;
cfg = config.tv.ejabberd; { config, ... }: let
# XXX this is a placeholder that happens to work the default strings. # See https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example
toErlang = builtins.toJSON;
in toFile "ejabberd.conf" '' ciphers = concatStringsSep ":" [
{loglevel, 3}. "ECDHE-ECDSA-AES256-GCM-SHA384"
{hosts, ${toErlang cfg.hosts}}. "ECDHE-RSA-AES256-GCM-SHA384"
{listen, "ECDHE-ECDSA-CHACHA20-POLY1305"
[ "ECDHE-RSA-CHACHA20-POLY1305"
{5222, ejabberd_c2s, [ "ECDHE-ECDSA-AES128-GCM-SHA256"
starttls, "ECDHE-RSA-AES128-GCM-SHA256"
{certfile, ${toErlang cfg.certfile.path}}, "ECDHE-ECDSA-AES256-SHA384"
{access, c2s}, "ECDHE-RSA-AES256-SHA384"
{shaper, c2s_shaper}, "ECDHE-ECDSA-AES128-SHA256"
{max_stanza_size, 65536} "ECDHE-RSA-AES128-SHA256"
]}, ];
{5269, ejabberd_s2s_in, [
{shaper, s2s_shaper}, protocol_options = [
{max_stanza_size, 131072} "no_sslv2"
]}, "no_sslv3"
{5280, ejabberd_http, [ "no_tlsv1"
captcha, "no_tlsv1_10"
http_bind, ];
http_poll,
web_admin in /* yaml */ ''
]}
]}. access_rules:
{s2s_use_starttls, required}. announce:
{s2s_certfile, ${toErlang cfg.s2s_certfile.path}}. - allow: admin
{auth_method, internal}. local:
{shaper, normal, {maxrate, 1000}}. - allow: local
{shaper, fast, {maxrate, 50000}}. configure:
{max_fsm_queue, 1000}. - allow: admin
{acl, local, {user_regexp, ""}}. register:
{access, max_user_sessions, [{10, all}]}. - allow
{access, max_user_offline_messages, [{5000, admin}, {100, all}]}. s2s:
{access, local, [{allow, local}]}. - allow
{access, c2s, [{deny, blocked}, trusted_network:
{allow, all}]}. - allow: loopback
{access, c2s_shaper, [{none, admin},
{normal, all}]}. acl:
{access, s2s_shaper, [{fast, all}]}. local:
{access, announce, [{allow, admin}]}. user_regexp: ""
{access, configure, [{allow, admin}]}. loopback:
{access, muc_admin, [{allow, admin}]}. ip:
{access, muc_create, [{allow, local}]}. - "127.0.0.0/8"
{access, muc, [{allow, all}]}. - "::1/128"
{access, pubsub_createnode, [{allow, local}]}. - "::FFFF:127.0.0.1/128"
{access, register, [{allow, all}]}.
{language, "en"}. hosts: ${toJSON config.hosts}
{modules,
[ language: "en"
{mod_adhoc, []},
{mod_announce, [{access, announce}]}, listen:
{mod_blocking,[]}, -
{mod_caps, []}, port: 5222
{mod_configure,[]}, ip: "::"
{mod_disco, []}, module: ejabberd_c2s
{mod_irc, []}, shaper: c2s_shaper
{mod_http_bind, []}, certfile: ${toJSON config.certfile.path}
{mod_last, []}, ciphers: ${toJSON ciphers}
{mod_muc, [ dhfile: ${toJSON config.dhfile.path}
{access, muc}, protocol_options: ${toJSON protocol_options}
{access_create, muc_create}, starttls: true
{access_persistent, muc_create}, starttls_required: true
{access_admin, muc_admin} tls: false
]}, tls_compression: false
{mod_offline, [{access_max_user_messages, max_user_offline_messages}]}, max_stanza_size: 65536
{mod_ping, []}, -
{mod_privacy, []}, port: 5269
{mod_private, []}, ip: "::"
{mod_pubsub, [ module: ejabberd_s2s_in
{access_createnode, pubsub_createnode}, shaper: s2s_shaper
{ignore_pep_from_offline, true}, max_stanza_size: 131072
{last_item_cache, false},
{plugins, ["flat", "hometree", "pep"]} loglevel: 4
]},
{mod_register, [ modules:
{welcome_message, {"Welcome!", mod_adhoc: {}
"Hi.\nWelcome to this XMPP server."}}, mod_admin_extra: {}
{ip_access, [{allow, "127.0.0.0/8"}, mod_announce:
{deny, "0.0.0.0/0"}]}, access: announce
{access, register} mod_caps: {}
]}, mod_carboncopy: {}
{mod_roster, []}, mod_client_state: {}
{mod_shared_roster,[]}, mod_configure: {}
{mod_stats, []}, mod_disco: {}
{mod_time, []}, mod_echo: {}
{mod_vcard, []}, mod_irc: {}
{mod_version, []} mod_bosh: {}
]}. mod_last: {}
mod_offline:
access_max_user_messages: max_user_offline_messages
mod_ping: {}
mod_privacy: {}
mod_private: {}
mod_register:
access_from: deny
access: register
ip_access: trusted_network
registration_watchers: ${toJSON config.registration_watchers}
mod_roster: {}
mod_shared_roster: {}
mod_stats: {}
mod_time: {}
mod_vcard:
search: false
mod_version: {}
mod_http_api: {}
s2s_access: s2s
s2s_certfile: ${toJSON config.s2s_certfile.path}
s2s_ciphers: ${toJSON ciphers}
s2s_dhfile: ${toJSON config.dhfile.path}
s2s_protocol_options: ${toJSON protocol_options}
s2s_tls_compression: false
s2s_use_starttls: required
shaper_rules:
max_user_offline_messages:
- 5000: admin
- 100
max_user_sessions: 10
c2s_shaper:
- none: admin
- normal
s2s_shaper: fast
'' ''

View File

@ -1,5 +1,17 @@
{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let { config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
cfg = config.tv.ejabberd; cfg = config.tv.ejabberd;
gen-dhparam = pkgs.writeDash "gen-dhparam" ''
set -efu
path=$1
bits=2048
# TODO regenerate dhfile after some time?
if ! test -e "$path"; then
${pkgs.openssl}/bin/openssl dhparam "$bits" > "$path"
fi
'';
in { in {
options.tv.ejabberd = { options.tv.ejabberd = {
enable = mkEnableOption "tv.ejabberd"; enable = mkEnableOption "tv.ejabberd";
@ -11,20 +23,36 @@ in {
source-path = toString <secrets> + "/ejabberd.pem"; source-path = toString <secrets> + "/ejabberd.pem";
}; };
}; };
dhfile = mkOption {
type = types.secret-file;
default = {
path = "${cfg.user.home}/dhparams.pem";
owner = cfg.user;
source-path = "/dev/null";
};
};
hosts = mkOption { hosts = mkOption {
type = with types; listOf str; type = with types; listOf str;
}; };
pkgs.ejabberdctl = mkOption { pkgs.ejabberdctl = mkOption {
type = types.package; type = types.package;
default = pkgs.writeDashBin "ejabberdctl" '' default = pkgs.writeDashBin "ejabberdctl" ''
set -efu
export SPOOLDIR=${shell.escape cfg.user.home}
export EJABBERD_CONFIG_PATH=${shell.escape (import ./config.nix args)}
exec ${pkgs.ejabberd}/bin/ejabberdctl \ exec ${pkgs.ejabberd}/bin/ejabberdctl \
--config ${toFile "ejabberd.yaml" (import ./config.nix {
inherit pkgs;
config = cfg;
})} \
--logs ${shell.escape cfg.user.home} \ --logs ${shell.escape cfg.user.home} \
--spool ${shell.escape cfg.user.home} \
"$@" "$@"
''; '';
}; };
registration_watchers = mkOption {
type = types.listOf types.str;
default = [
config.krebs.users.tv.mail
];
};
s2s_certfile = mkOption { s2s_certfile = mkOption {
type = types.secret-file; type = types.secret-file;
default = cfg.certfile; default = cfg.certfile;
@ -50,12 +78,12 @@ in {
requires = [ "secret.service" ]; requires = [ "secret.service" ];
after = [ "network.target" "secret.service" ]; after = [ "network.target" "secret.service" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; ExecStartPre = "${gen-dhparam} ${cfg.dhfile.path}";
RemainAfterExit = "yes"; ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl foreground";
PermissionsStartOnly = "true"; PermissionsStartOnly = true;
SyslogIdentifier = "ejabberd"; SyslogIdentifier = "ejabberd";
User = cfg.user.name; User = cfg.user.name;
ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl start"; TimeoutStartSec = 60;
}; };
}; };

View File

@ -28,10 +28,6 @@ in {
"$@" "$@"
''; '';
ejabberd = callPackage ./ejabberd {
erlang = self.erlangR16;
};
ff = self.writeDashBin "ff" '' ff = self.writeDashBin "ff" ''
exec ${self.firefoxWrapper}/bin/firefox "$@" exec ${self.firefoxWrapper}/bin/firefox "$@"
''; '';

View File

@ -1,28 +0,0 @@
{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
stdenv.mkDerivation rec {
version = "2.1.13";
name = "ejabberd-${version}";
src = fetchurl {
url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8";
};
buildInputs = [ expat erlang zlib openssl pam ];
patchPhase = ''
sed -i \
-e "s|erl \\\|${erlang}/bin/erl \\\|" \
-e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \
src/ejabberdctl.template
'';
preConfigure = ''
cd src
'';
configureFlags = ["--enable-pam"];
meta = {
description = "Open-source XMPP application server written in Erlang";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.ejabberd.im;
maintainers = [ lib.maintainers.sander ];
};
}