Merge remote-tracking branch 'prism/master'

This commit is contained in:
tv 2021-12-22 23:33:05 +01:00
commit 448cd3b9af
38 changed files with 431 additions and 961 deletions

View File

@ -10,6 +10,7 @@
<stockholm/krebs/2configs/ircd.nix> <stockholm/krebs/2configs/ircd.nix>
<stockholm/krebs/2configs/reaktor2.nix> <stockholm/krebs/2configs/reaktor2.nix>
<stockholm/krebs/2configs/wiki.nix> <stockholm/krebs/2configs/wiki.nix>
<stockholm/krebs/2configs/acme.nix>
## shackie irc bot ## shackie irc bot
<stockholm/krebs/2configs/shack/reaktor.nix> <stockholm/krebs/2configs/shack/reaktor.nix>

67
krebs/2configs/acme.nix Normal file
View File

@ -0,0 +1,67 @@
# generate intermediate certificate with generate-krebs-intermediate-ca
{ config, lib, pkgs, ... }: let
domain = "ca.r";
in {
security.acme = {
acceptTerms = true; # kinda pointless since we never use upstream
email = "spam@krebsco.de";
certs.${domain}.server = "https://${domain}:1443/acme/acme/directory"; # use 1443 here cause bootstrapping loop
};
networking.firewall.allowedTCPPorts = [ 80 443 ];
services.nginx = {
enable = true;
recommendedProxySettings = true;
virtualHosts.${domain} = {
addSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "https://localhost:1443";
};
locations."= /ca.crt".alias = ../6assets/krebsAcmeCA.crt;
};
};
krebs.secret.files.krebsAcme = {
path = "/var/lib/step-ca/intermediate_ca.key";
owner.name = "root";
mode = "1444";
source-path = builtins.toString <secrets> + "/acme_ca.key";
};
services.step-ca = {
enable = true;
intermediatePasswordFile = "/dev/null";
address = "0.0.0.0";
port = 1443;
settings = {
root = pkgs.writeText "root.crt" config.krebs.ssl.rootCA;
crt = pkgs.writeText "intermediate.crt" config.krebs.ssl.intermediateCA;
key = "/var/lib/step-ca/intermediate_ca.key";
dnsNames = [ domain ];
logger.format = "text";
db = {
type = "badger";
dataSource = "/var/lib/step-ca/db";
};
authority = {
provisioners = [{
type = "ACME";
name = "acme";
forceCN = true;
}];
claims = {
maxTLSCertDuration = "2160h";
defaultTLSCertDuration = "2160h";
};
backdate = "1m0s";
};
tls = {
cipherSuites = [
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
];
minVersion = 1.2;
maxVersion = 1.3;
renegotiation = false;
};
};
};
}

View File

@ -6,11 +6,13 @@
enable = true; enable = true;
virtualHosts.build = { virtualHosts.build = {
serverAliases = [ "build.r" "build.${config.networking.hostName}.r" ]; serverAliases = [ "build.r" "build.${config.networking.hostName}.r" ];
locations."/".extraConfig = '' locations."/" = {
proxy_set_header Upgrade $http_upgrade; proxyPass = "http://127.0.0.1:${toString config.services.buildbot-master.port}";
proxy_set_header Connection "upgrade"; proxyWebsockets = true;
proxy_pass http://127.0.0.1:${toString config.krebs.buildbot.master.web.port}; extraConfig = ''
''; proxy_read_timeout 3600s;
'';
};
}; };
}; };
krebs.ci = { krebs.ci = {
@ -18,25 +20,20 @@
repos = { repos = {
disko.urls = [ disko.urls = [
"http://cgit.gum.r/disko" "http://cgit.gum.r/disko"
"http://cgit.hotdog.r/disko"
"http://cgit.ni.r/disko" "http://cgit.ni.r/disko"
"http://cgit.prism.r/disko" "http://cgit.prism.r/disko"
]; ];
krops.urls = [ krops.urls = [
"http://cgit.hotdog.r/krops"
"http://cgit.ni.r/krops" "http://cgit.ni.r/krops"
"http://cgit.prism.r/krops" "http://cgit.prism.r/krops"
"https://github.com/krebs/krops.git" "https://github.com/krebs/krops.git"
]; ];
nix_writers.urls = [ nix_writers.urls = [
"http://cgit.hotdog.r/nix-writers"
"http://cgit.ni.r/nix-writers" "http://cgit.ni.r/nix-writers"
"http://cgit.prism.r/nix-writers" "http://cgit.prism.r/nix-writers"
]; ];
stockholm.urls = [ stockholm.urls = [
"http://cgit.enklave.r/stockholm"
"http://cgit.gum.r/stockholm" "http://cgit.gum.r/stockholm"
"http://cgit.hotdog.r/stockholm"
"http://cgit.ni.r/stockholm" "http://cgit.ni.r/stockholm"
"http://cgit.prism.r/stockholm" "http://cgit.prism.r/stockholm"
]; ];

View File

@ -4,18 +4,14 @@ with import <stockholm/lib>;
{ {
imports = [ imports = [
./backup.nix ./backup.nix
(let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
environment.variables = {
CURL_CA_BUNDLE = ca-bundle;
GIT_SSL_CAINFO = ca-bundle;
SSL_CERT_FILE = ca-bundle;
};
})
]; ];
krebs.announce-activation.enable = true; krebs.announce-activation.enable = true;
krebs.enable = true; krebs.enable = true;
krebs.tinc.retiolum.enable = mkDefault true; krebs.tinc.retiolum.enable = mkDefault true;
# trust krebs ACME CA
krebs.ssl.trustIntermediate = true;
krebs.build.user = mkDefault config.krebs.users.krebs; krebs.build.user = mkDefault config.krebs.users.krebs;
networking.hostName = config.krebs.build.host.name; networking.hostName = config.krebs.build.host.name;

View File

@ -7,6 +7,7 @@
config.krebs.users.raute.pubkey config.krebs.users.raute.pubkey
config.krebs.users.ulrich.pubkey config.krebs.users.ulrich.pubkey
config.krebs.users.xq.pubkey config.krebs.users.xq.pubkey
config.krebs.users.xkey.pubkey
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDb9NPa2Hf51afcG1H13UPbE5E02J8aC9a1sGCRls592wAVlQbmojYR1jWDPA2m32Bsyv0ztqi81zDyndWWZPQVJVBk00VjYBcgk6D5ifqoAuWLzfuHJPWZGOvBf/U74/LNFNUkj1ywjneK7HYTRPXrRBBfBSQNmQzkvue7s599L2vdueZKyjNsMpx2m6nm2SchaMuDskSQut/168JgU1l4M8BeT68Bo4WdelhBYnhSI1a59FGkgdu2SCjyighLQRy2sOH3ksnkHWENPkA+wwQOlKl7R3DsEybrNd4NU9FSwFDyDmdhfv5gJp8UGSFdjAwx43+8zM5t5ruZ25J0LnVb0PuTuRA00UsW83MkLxFpDQLrQV08tlsY6iGrqxP67C3VJ6t4v6oTp7/vaRLhEFc1PhOLh+sZ18o8MLO+e2rGmHGHQnSKfBOLUvDMGa4jb01XBGjdnIXLOkVo79YR5jZn7jJb2gTZ95OD6bWSDADoURSuwuLa7kh4ti1ItAKuhkIvbuky3rRVvQEc92kJ6aNUswIUXJa0K2ibbIY6ycKAA3Ljksl3Mm9KzOn6yc/i/lSF+SOrTGhabPJigKkIoqKIwnV5IU3gkfsxPQJOBMPqHDGAOeYQe3WpWedEPYuhQEczw4exMb9TkNE96F71PzuQPJDl5sPAWyPLeMKpy5XbfRiF2by4nxN3ZIQvjtoyVkjNV+qM0q0yKBzLxuRAEQOZ2yCEaBudZQkQiwHD97H2vu4SRQ/2aOie1XiOnmdbQRDZSO3BsoDK569K1w+gDfSnqY7zVUMj6tw+uKx6Gstck5lbvYMtdWKsfPv/pDM8eyIVFLL93dKTX+ertcQj6xDwLfOiNubE5ayFXhYkjwImV6NgfBuq+3hLK0URP2rPlOZbbZTQ0WlKD6CCRZPMSZCU9oD2zYfqpvRArBUcdkAwGePezORkfJQLE6mYEJp6pdFkJ/IeFLbO6M0lZVlfnpzAC9kjjkMCRofZUETcFSppyTImCbgo3+ok59/PkNU5oavBXyW80ue2tWHr08HX/QALNte3UITmIIlU6SFMCPMWJqadK1eDPWfJ4H4iDXRNn3D5wqN++iMloKvpaj0wieqXLY4+YfvNTNr177OU48GEWW8DnoEkbpwsCbjPxznGDQhdDqdYyMY/fDgRQReKITvKYGHRzesGysw5cKsp9LEfXD0R6WE2TeiiENla5AWzTgXJB0AyZEcOiIfqOgT9Nr9S8q5gc/BdA7P+jhGGJgEHhV3dVlfIZ7pmZc27Yu7UTQ0lbAKWqcMSTOdne+QL6ILzbvLrQwdvax4tQdm5opfU16SrOox1AMwAbkdq84z6uJqYVx3cUXfMJgTyDNrVv3or root@plattenschwein" # for backup "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDb9NPa2Hf51afcG1H13UPbE5E02J8aC9a1sGCRls592wAVlQbmojYR1jWDPA2m32Bsyv0ztqi81zDyndWWZPQVJVBk00VjYBcgk6D5ifqoAuWLzfuHJPWZGOvBf/U74/LNFNUkj1ywjneK7HYTRPXrRBBfBSQNmQzkvue7s599L2vdueZKyjNsMpx2m6nm2SchaMuDskSQut/168JgU1l4M8BeT68Bo4WdelhBYnhSI1a59FGkgdu2SCjyighLQRy2sOH3ksnkHWENPkA+wwQOlKl7R3DsEybrNd4NU9FSwFDyDmdhfv5gJp8UGSFdjAwx43+8zM5t5ruZ25J0LnVb0PuTuRA00UsW83MkLxFpDQLrQV08tlsY6iGrqxP67C3VJ6t4v6oTp7/vaRLhEFc1PhOLh+sZ18o8MLO+e2rGmHGHQnSKfBOLUvDMGa4jb01XBGjdnIXLOkVo79YR5jZn7jJb2gTZ95OD6bWSDADoURSuwuLa7kh4ti1ItAKuhkIvbuky3rRVvQEc92kJ6aNUswIUXJa0K2ibbIY6ycKAA3Ljksl3Mm9KzOn6yc/i/lSF+SOrTGhabPJigKkIoqKIwnV5IU3gkfsxPQJOBMPqHDGAOeYQe3WpWedEPYuhQEczw4exMb9TkNE96F71PzuQPJDl5sPAWyPLeMKpy5XbfRiF2by4nxN3ZIQvjtoyVkjNV+qM0q0yKBzLxuRAEQOZ2yCEaBudZQkQiwHD97H2vu4SRQ/2aOie1XiOnmdbQRDZSO3BsoDK569K1w+gDfSnqY7zVUMj6tw+uKx6Gstck5lbvYMtdWKsfPv/pDM8eyIVFLL93dKTX+ertcQj6xDwLfOiNubE5ayFXhYkjwImV6NgfBuq+3hLK0URP2rPlOZbbZTQ0WlKD6CCRZPMSZCU9oD2zYfqpvRArBUcdkAwGePezORkfJQLE6mYEJp6pdFkJ/IeFLbO6M0lZVlfnpzAC9kjjkMCRofZUETcFSppyTImCbgo3+ok59/PkNU5oavBXyW80ue2tWHr08HX/QALNte3UITmIIlU6SFMCPMWJqadK1eDPWfJ4H4iDXRNn3D5wqN++iMloKvpaj0wieqXLY4+YfvNTNr177OU48GEWW8DnoEkbpwsCbjPxznGDQhdDqdYyMY/fDgRQReKITvKYGHRzesGysw5cKsp9LEfXD0R6WE2TeiiENla5AWzTgXJB0AyZEcOiIfqOgT9Nr9S8q5gc/BdA7P+jhGGJgEHhV3dVlfIZ7pmZc27Yu7UTQ0lbAKWqcMSTOdne+QL6ILzbvLrQwdvax4tQdm5opfU16SrOox1AMwAbkdq84z6uJqYVx3cUXfMJgTyDNrVv3or root@plattenschwein" # for backup
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Lx5MKtVjB/Ef6LpEiIAgVwY5xKQFdHuLQR+odQO4cAgxj1QaIXGN0moixY52DebVQhAtiCNiFZ83uJyOj8kmu30yuXwtSOQeqziA859qMJKZ4ZcYdKvbXwnf2Chm5Ck/0FvtpjTWHIZAogwP1wQto/lcqHOjrTAnZeJfQuHTswYUSnmUU5zdsEZ9HidDPUc2Gv0wkBNd+KMQyOZl0HkaxHWvn0h4KK4hYZisOpeTfXJxD87bo+Eg4LL2vvnHW6dF6Ygrbd/0XRMsRRI8OAReVBUoJn7IE1wwAl/FpblNmhaF9hlL7g7hR1ADvaWMMw0e8SSzW6Y+oIa8qFQL6wR1 gitlab-builder" # for being deployed by gitlab ci "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Lx5MKtVjB/Ef6LpEiIAgVwY5xKQFdHuLQR+odQO4cAgxj1QaIXGN0moixY52DebVQhAtiCNiFZ83uJyOj8kmu30yuXwtSOQeqziA859qMJKZ4ZcYdKvbXwnf2Chm5Ck/0FvtpjTWHIZAogwP1wQto/lcqHOjrTAnZeJfQuHTswYUSnmUU5zdsEZ9HidDPUc2Gv0wkBNd+KMQyOZl0HkaxHWvn0h4KK4hYZisOpeTfXJxD87bo+Eg4LL2vvnHW6dF6Ygrbd/0XRMsRRI8OAReVBUoJn7IE1wwAl/FpblNmhaF9hlL7g7hR1ADvaWMMw0e8SSzW6Y+oIa8qFQL6wR1 gitlab-builder" # for being deployed by gitlab ci
]; ];

View File

@ -29,6 +29,7 @@ in
{ {
services.gollum = { services.gollum = {
enable = true; enable = true;
address = "::1";
extraConfig = '' extraConfig = ''
Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1| Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
system('${pushCgit}') system('${pushCgit}')
@ -38,16 +39,20 @@ in
systemd.services.gollum.environment.LC_ALL = "en_US.UTF-8"; systemd.services.gollum.environment.LC_ALL = "en_US.UTF-8";
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
security.acme.certs."wiki.r".server = config.krebs.ssl.acmeURL;
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts.wiki = { virtualHosts."wiki.r" = {
serverAliases = [ "wiki.r" "wiki.${config.networking.hostName}.r" ]; enableACME = true;
locations."/".extraConfig = '' addSSL = true;
proxy_set_header Upgrade $http_upgrade; locations."/" = {
proxy_set_header Connection "upgrade"; proxyPass = "http://[::1]:${toString config.services.gollum.port}";
proxy_pass http://127.0.0.1:${toString config.services.gollum.port}; proxyWebsockets = true;
''; extraConfig = ''
proxy_set_header Host $host;
'';
};
}; };
}; };

View File

@ -1,382 +0,0 @@
{ config, pkgs, lib, ... }:
with import <stockholm/lib>;
let
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *
import re
import json
c = BuildmasterConfig = {}
c['slaves'] = []
slaves = json.loads('${builtins.toJSON cfg.slaves}')
slavenames = [ s for s in slaves ]
for k,v in slaves.items():
c['slaves'].append(buildslave.BuildSlave(k, v))
# TODO: configure protocols?
c['protocols'] = {'pb': {'port': 9989}}
####### Build Inputs
c['change_source'] = cs = []
${ concatStringsSep "\n"
(mapAttrsToList (n: v: ''
#### Change_Source: Begin of ${n}
${v}
#### Change_Source: End of ${n}
'') cfg.change_source )}
####### Build Scheduler
c['schedulers'] = sched = []
${ concatStringsSep "\n"
(mapAttrsToList (n: v: ''
#### Schedulers: Begin of ${n}
${v}
#### Schedulers: End of ${n}
'') cfg.scheduler )}
###### Builder
c['builders'] = bu = []
# Builder Pre: Begin
${cfg.builder_pre}
# Builder Pre: End
${ concatStringsSep "\n"
(mapAttrsToList (n: v: ''
#### Builder: Begin of ${n}
${v}
#### Builder: End of ${n}
'') cfg.builder )}
####### Status
c['status'] = st = []
# If you want to configure this url, override with extraConfig
c['buildbotURL'] = "http://${config.networking.hostName}:${toString cfg.web.port}/"
${optionalString (cfg.web.enable) ''
from buildbot.status import html
from buildbot.status.web import authz, auth
authz_cfg=authz.Authz(
auth=auth.BasicAuth([ ("${cfg.web.username}","${cfg.web.password}") ]),
# TODO: configure harder
gracefulShutdown = False,
forceBuild = 'auth',
forceAllBuilds = 'auth',
pingBuilder = False,
stopBuild = 'auth',
stopAllBuilds = 'auth',
cancelPendingBuild = 'auth'
)
# TODO: configure krebs.nginx
st.append(html.WebStatus(http_port=${toString cfg.web.port}, authz=authz_cfg))
''}
${optionalString (cfg.irc.enable) ''
from buildbot.status import words
irc = words.IRC("${cfg.irc.server}", "${cfg.irc.nick}",
channels=${builtins.toJSON cfg.irc.channels},
notify_events={
'started': 1,
'success': 1,
'failure': 1,
'exception': 1,
'successToFailure': 1,
'failureToSuccess': 1,
}${optionalString cfg.irc.allowForce ",allowForce=True"})
c['status'].append(irc)
''}
${ concatStringsSep "\n"
(mapAttrsToList (n: v: ''
#### Status: Begin of ${n}
${v}
#### Status: End of ${n}
'') cfg.status )}
####### PROJECT IDENTITY
c['title'] = "${cfg.title}"
c['titleURL'] = "http://krebsco.de"
####### DB URL
# TODO: configure
c['db'] = {
'db_url' : "sqlite:///state.sqlite",
}
${cfg.extraConfig}
'';
cfg = config.krebs.buildbot.master;
api = {
enable = mkEnableOption "Buildbot Master";
title = mkOption {
default = "Buildbot CI";
type = types.str;
description = ''
Title of the Buildbot Installation
'';
};
workDir = mkOption {
default = "/var/lib/buildbot/master";
type = types.str;
description = ''
Path to build bot master directory.
Will be created on startup.
'';
};
secrets = mkOption {
default = [];
type = types.listOf types.str;
example = [ "cac.json" ];
description = ''
List of all the secrets in secrets which should be copied into the
buildbot master directory.
'';
};
slaves = mkOption {
default = {};
type = types.attrsOf types.str;
description = ''
Attrset of slavenames with their passwords
slavename = slavepassword
'';
};
change_source = mkOption {
default = {};
type = types.attrsOf types.str;
example = {
stockholm = ''
cs.append(changes.GitPoller(
'http://cgit.gum/stockholm',
workdir='stockholm-poller', branch='master',
project='stockholm',
pollinterval=120))
'';
};
description = ''
Attrset of all the change_sources which should be configured.
It will be directly included into the master configuration.
At the end an change object should be appended to <literal>cs</literal>
'';
};
scheduler = mkOption {
default = {};
type = types.attrsOf types.str;
example = {
force-scheduler = ''
sched.append(schedulers.ForceScheduler(
name="force",
builderNames=["full-tests"]))
'';
};
description = ''
Attrset of all the schedulers which should be configured.
It will be directly included into the master configuration.
At the end an change object should be appended to <literal>sched</literal>
'';
};
builder_pre = mkOption {
default = "";
type = types.lines;
example = ''
grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
'';
description = ''
some code before the builders are being assembled.
can be used to define functions used by multiple builders
'';
};
builder = mkOption {
default = {};
type = types.attrsOf types.str;
example = {
fast-test = ''
'';
};
description = ''
Attrset of all the builder which should be configured.
It will be directly included into the master configuration.
At the end an change object should be appended to <literal>bu</literal>
'';
};
status = mkOption {
default = {};
type = types.attrsOf types.str;
description = ''
Attrset of all the extra status which should be configured.
It will be directly included into the master configuration.
At the end an change object should be appended to <literal>st</literal>
Right now IRC and Web status can be configured by setting
<literal>buildbot.master.irc.enable</literal> and
<literal>buildbot.master.web.enable</literal>
'';
};
# Configurable Stati
web = mkOption {
default = {};
type = types.submodule ({ config2, ... }: {
options = {
enable = mkEnableOption "Buildbot Master Web Status";
username = mkOption {
default = "krebs";
type = types.str;
description = ''
username for web authentication
'';
};
hostname = mkOption {
default = config.networking.hostName;
type = types.str;
description = ''
web interface Hostname
'';
};
password = mkOption {
default = "bob";
type = types.str;
description = ''
password for web authentication
'';
};
port = mkOption {
default = 8010;
type = types.int;
description = ''
port for buildbot web status
'';
};
};
});
};
irc = mkOption {
default = {};
type = types.submodule ({ config, ... }: {
options = {
enable = mkEnableOption "Buildbot Master IRC Status";
channels = mkOption {
default = [ "nix-buildbot-meetup" ];
type = with types; listOf str;
description = ''
irc channels the bot should connect to
'';
};
allowForce = mkOption {
default = false;
type = types.bool;
description = ''
Determines if builds can be forced via IRC
'';
};
nick = mkOption {
default = "nix-buildbot";
type = types.str;
description = ''
nickname for IRC
'';
};
server = mkOption {
default = "irc.freenode.net";
type = types.str;
description = ''
Buildbot Status IRC Server to connect to
'';
};
};
});
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
extra config appended to the generated master.cfg
'';
};
};
imp = {
users.extraUsers.buildbotMaster = {
uid = genid "buildbotMaster";
group = "buildbotMaster";
description = "Buildbot Master";
home = cfg.workDir;
createHome = false;
isSystemUser = true;
};
users.extraGroups.buildbotMaster = {
gid = 672626386;
};
systemd.services.buildbotMaster = {
description = "Buildbot Master";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
# TODO: add extra dependencies to master like svn and cvs
path = [ pkgs.git ];
environment = {
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
};
serviceConfig = let
workdir = shell.escape cfg.workDir;
secretsdir = shell.escape (toString <secrets>);
in {
PermissionsStartOnly = true;
# TODO: maybe also prepare buildbot.tac?
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
set -efux
if [ ! -e ${workdir} ];then
mkdir -p ${workdir}
${pkgs.buildbot-classic}/bin/buildbot create-master -r -l 10 -f ${workdir}
fi
# always override the master.cfg
cp ${buildbot-master-config} ${workdir}/master.cfg
# copy secrets
${ concatMapStringsSep "\n"
(f: "cp ${secretsdir}/${f} ${workdir}/${f}" ) cfg.secrets }
# sanity
${pkgs.buildbot-classic}/bin/buildbot checkconfig ${workdir}
# TODO: maybe upgrade? not sure about this
# normally we should write buildbot.tac by our own
# ${pkgs.buildbot-classic}/bin/buildbot upgrade-master ${workdir}
chmod 700 ${workdir}
chown buildbotMaster:buildbotMaster -R ${workdir}
'';
ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}";
PrivateTmp = "true";
User = "buildbotMaster";
Restart = "always";
RestartSec = "10";
};
};
};
in
{
options.krebs.buildbot.master = api;
config = lib.mkIf cfg.enable imp;
}

View File

@ -1,186 +0,0 @@
{ config, pkgs, lib, ... }:
with import <stockholm/lib>;
let
buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
import os
from buildslave.bot import BuildSlave
from twisted.application import service
basedir = '${cfg.workDir}'
rotateLength = 10000000
maxRotatedFiles = 10
application = service.Application('buildslave')
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver
logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength,
maxRotatedFiles=maxRotatedFiles)
application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
buildmaster_host = '${cfg.masterhost}'
# TODO: masterport?
port = 9989
slavename = '${cfg.username}'
passwd = '${cfg.password}'
keepalive = 600
usepty = 0
umask = None
maxdelay = 300
allow_shutdown = None
${cfg.extraConfig}
s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,
keepalive, usepty, umask=umask, maxdelay=maxdelay,
allow_shutdown=allow_shutdown)
s.setServiceParent(application)
'';
default-packages = [ pkgs.git pkgs.bash ];
cfg = config.krebs.buildbot.slave;
api = {
enable = mkEnableOption "Buildbot Slave";
workDir = mkOption {
default = "/var/lib/buildbot/slave";
type = types.str;
description = ''
Path to build bot slave directory.
Will be created on startup.
'';
};
masterhost = mkOption {
default = "localhost";
type = types.str;
description = ''
Hostname/IP of the buildbot master
'';
};
username = mkOption {
type = types.str;
description = ''
slavename used to authenticate with master
'';
};
password = mkOption {
type = types.str;
description = ''
slave password used to authenticate with master
'';
};
contact = mkOption {
default = "nix slave <buildslave@${config.networking.hostName}>";
type = types.str;
description = ''
contact to be announced by buildslave
'';
};
description = mkOption {
default = "Nix Generated BuildSlave";
type = types.str;
description = ''
description for hostto be announced by buildslave
'';
};
packages = mkOption {
default = [ pkgs.git ];
type = with types; listOf package;
description = ''
packages which should be in path for buildslave
'';
};
extraEnviron = mkOption {
default = {};
example = {
NIX_PATH = "nixpkgs=/path/to/my/nixpkgs";
};
type = types.attrsOf types.str;
description = ''
extra environment variables to be provided to the buildslave service
if you need nixpkgs, e.g. for running nix-shell you can set NIX_PATH here.
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
example = ''
port = 443
keepalive = 600
'';
description = ''
extra config evaluated before calling BuildSlave init in .tac file
'';
};
};
imp = {
users.extraUsers.buildbotSlave = {
uid = genid "buildbotSlave";
group = "buildbotSlave";
description = "Buildbot Slave";
home = cfg.workDir;
createHome = false;
isSystemUser = true;
};
users.extraGroups.buildbotSlave = {
gid = 1408105834;
};
systemd.services."buildbotSlave-${cfg.username}-${cfg.masterhost}" = {
description = "Buildbot Slave for ${cfg.username}@${cfg.masterhost}";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = default-packages ++ cfg.packages;
environment = {
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
NIX_REMOTE="daemon";
} // cfg.extraEnviron;
serviceConfig = let
workdir = shell.escape cfg.workDir;
contact = shell.escape cfg.contact;
description = shell.escape cfg.description;
# TODO:make this
in {
PermissionsStartOnly = true;
Type = "forking";
PIDFile = "${workdir}/twistd.pid";
# TODO: maybe also prepare buildbot.tac?
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
set -efux
mkdir -p ${workdir}/info
cp ${buildbot-slave-init} ${workdir}/buildbot.tac
echo ${contact} > ${workdir}/info/admin
echo ${description} > ${workdir}/info/host
chown buildbotSlave:buildbotSlave -R ${workdir}
chmod 700 ${workdir}
'';
ExecStart = "${pkgs.buildbot-classic-slave}/bin/buildslave start ${workdir}";
ExecStop = "${pkgs.buildbot-classic-slave}/bin/buildslave stop ${workdir}";
PrivateTmp = "true";
User = "buildbotSlave";
Restart = "always";
RestartSec = "10";
};
};
};
in
{
options.krebs.buildbot.slave = api;
config = lib.mkIf cfg.enable imp;
}

View File

@ -39,148 +39,144 @@ let
profileRoot = "/nix/var/nix/profiles/ci"; profileRoot = "/nix/var/nix/profiles/ci";
bcfg = config.services.buildbot-master;
imp = { imp = {
krebs.buildbot.master = { services.buildbot-master = {
slaves = { workers = [ "worker.Worker('testworker', 'pass')" ];
testslave = "lasspass";
};
change_source = mapAttrs' (name: repo: changeSource = mapAttrsToList (name: repo:
nameValuePair name (concatMapStrings (url: '' concatMapStringsSep "," (url: ''
cs.append( changes.GitPoller(
changes.GitPoller( "${url}",
"${url}", workdir='${name}-${elemAt(splitString "." url) 1}', branches=True,
workdir='${name}-${elemAt(splitString "." url) 1}', branches=True, project='${name}',
project='${name}', pollinterval=100
pollinterval=100
)
) )
'') repo.urls) '') repo.urls
) cfg.repos; ) cfg.repos;
scheduler = mapAttrs' (name: repo: schedulers = mapAttrsToList (name: repo: ''
nameValuePair name '' schedulers.SingleBranchScheduler(
sched.append( change_filter=util.ChangeFilter(
schedulers.SingleBranchScheduler( branch_re=".*",
change_filter=util.ChangeFilter( project='${name}',
branch_re=".*", ),
project='${name}', treeStableTimer=60,
), name="${name}-all-branches",
treeStableTimer=60, builderNames=[
name="${name}-all-branches", "${name}",
builderNames=[ ]
"${name}", ),
] schedulers.ForceScheduler(
) name="${name}",
) builderNames=[
sched.append( "${name}",
schedulers.ForceScheduler( ]
name="${name}", )
builderNames=[ '') cfg.repos;
"${name}",
]
)
)
''
) cfg.repos;
builder_pre = ''
from buildbot import interfaces
from buildbot.steps.shell import ShellCommand
class StepToStartMoreSteps(ShellCommand): builders = [];
extraConfig = ''
# https://docs.buildbot.net/latest/manual/configuration/buildfactories.html
from buildbot.plugins import util, steps
from buildbot.process import buildstep, logobserver
from twisted.internet import defer
import json
class GenerateStagesCommand(buildstep.ShellMixin, steps.BuildStep):
def __init__(self, **kwargs): def __init__(self, **kwargs):
ShellCommand.__init__(self, **kwargs) kwargs = self.setupShellMixin(kwargs)
super().__init__(**kwargs)
self.observer = logobserver.BufferLogObserver()
self.addLogObserver('stdio', self.observer)
def addBuildSteps(self, steps_factories): def extract_stages(self, stdout):
for sf in steps_factories: stages = json.loads(stdout)
step = interfaces.IBuildStepFactory(sf).buildStep() return stages
step.setBuild(self.build)
step.setBuildSlave(self.build.slavebuilder.slave)
step_status = self.build.build_status.addStepWithName(step.name)
step.setStepStatus(step_status)
self.build.steps.append(step)
def start(self): @defer.inlineCallbacks
props = self.build.getProperties() def run(self):
new_steps = json.loads(props.getProperty('steps_json')) # run nix-instanstiate to generate the dict of stages
for new_step in new_steps: cmd = yield self.makeRemoteShellCommand()
self.addBuildSteps([steps.ShellCommand( yield self.runCommand(cmd)
name=str(new_step),
command=[ # if the command passes extract the list of stages
"${pkgs.writeDash "build-stepper.sh" '' result = cmd.results()
if result == util.SUCCESS:
# create a ShellCommand for each stage and add them to the build
stages = self.extract_stages(self.observer.getStdout())
self.build.addStepsAfterCurrentStep([
steps.ShellCommand(
name=stage,
env=dict(
build_name = stage,
build_script = stages[stage],
),
command="${pkgs.writeDash "build.sh" ''
set -xefu set -xefu
profile=${shell.escape profileRoot}/$build_name profile=${shell.escape profileRoot}/$build_name
result=$("$build_script") result=$("$build_script")
if [ -n "$result" ]; then if [ -n "$result" ]; then
${pkgs.nix}/bin/nix-env -p "$profile" --set "$result" ${pkgs.nix}/bin/nix-env -p "$profile" --set "$result"
fi fi
''}" ''}",
], ) for stage in stages
env={ ])
"build_name": new_step,
"build_script": new_steps[new_step],
"NIX_REMOTE": "daemon",
"NIX_PATH": "secrets=/var/src/stockholm/null:/var/src",
},
timeout=90001,
workdir='build', # TODO figure out why we need this?
)])
ShellCommand.start(self) return result
'';
builder = mapAttrs' (name: repo: ${concatStringsSep "\n" (mapAttrsToList (name: repo: ''
nameValuePair name '' factory_${name} = util.BuildFactory()
f_${name} = util.BuildFactory() factory_${name}.addStep(steps.Git(
f_${name}.addStep(steps.Git(
repourl=util.Property('repository', '${head repo.urls}'), repourl=util.Property('repository', '${head repo.urls}'),
method='clobber', method='clobber',
mode='full', mode='full',
submodules=True, submodules=True,
)) ))
f_${name}.addStep(steps.SetPropertyFromCommand( factory_${name}.addStep(GenerateStagesCommand(
env={ env={
"NIX_REMOTE": "daemon", "NIX_REMOTE": "daemon",
"NIX_PATH": "secrets=/var/src/stockholm/null:/var/src", "NIX_PATH": "secrets=/var/src/stockholm/null:/var/src",
}, },
name="get_steps", name="Generate build stages",
command=["${getJobs}"], command=[
extract_fn=lambda rc, stdout, stderr: { 'steps_json': stdout }, "${getJobs}"
],
haltOnFailure=True,
)) ))
f_${name}.addStep(StepToStartMoreSteps(command=["echo"])) # TODO remove dummy command from here
bu.append( c['builders'].append(
util.BuilderConfig( util.BuilderConfig(
name="${name}", name="${name}",
slavenames=slavenames, workernames=['testworker'],
factory=f_${name} factory=factory_${name}
) )
) )
'' '') cfg.repos)}
) cfg.repos; '';
enable = true; enable = true;
web.enable = true; reporters = [''
irc = { reporters.IRC(
enable = true; host = "irc.r",
nick = "build|${hostname}"; nick = "buildbot|${hostname}",
server = "irc.r"; notify_events = [ 'started', 'finished', 'failure', 'success', 'exception', 'problem' ],
channels = [ "xxx" "noise" ]; channels = [{"channel": "#xxx"}],
allowForce = true; )
}; ''];
extraConfig = ''
c['buildbotURL'] = "http://build.${hostname}.r/" buildbotUrl = "http://build.${hostname}.r/";
'';
}; };
krebs.buildbot.slave = { services.buildbot-worker = {
enable = true; enable = true;
masterhost = "localhost"; workerUser = "testworker";
username = "testslave"; workerPass = "pass";
password = "lasspass"; packages = with pkgs; [ git gnutar gzip jq nix populate ];
packages = with pkgs; [ gnumake jq nix populate gnutar lzma gzip ];
}; };
system.activationScripts.buildbots-nix-profile = '' system.activationScripts.buildbots-nix-profile = ''
@ -192,11 +188,10 @@ let
users = { users = {
groups.buildbots.gid = genid "buildbots"; groups.buildbots.gid = genid "buildbots";
users = { users = {
buildbotMaster.extraGroups = [ "buildbots" ]; buildbot.extraGroups = [ "buildbots" ];
buildbotSlave.extraGroups = [ "buildbots" ]; bbworker.extraGroups = [ "buildbots" ];
}; };
}; };
}; };
in out in out

View File

@ -13,8 +13,6 @@ let
./bepasty-server.nix ./bepasty-server.nix
./bindfs.nix ./bindfs.nix
./brockman.nix ./brockman.nix
./buildbot/master.nix
./buildbot/slave.nix
./build.nix ./build.nix
./cachecache.nix ./cachecache.nix
./ci.nix ./ci.nix
@ -50,6 +48,7 @@ let
./secret.nix ./secret.nix
./setuid.nix ./setuid.nix
./shadow.nix ./shadow.nix
./ssl.nix
./sync-containers.nix ./sync-containers.nix
./tinc.nix ./tinc.nix
./tinc_graphs.nix ./tinc_graphs.nix

View File

@ -754,7 +754,9 @@ in {
mail = "xq@shackspace.de"; mail = "xq@shackspace.de";
pubkey = ssh-for "xq"; pubkey = ssh-for "xq";
}; };
xkey = {}; xkey = {
pubkey = ssh-for "xkey";
};
miaoski = { miaoski = {
}; };
filly = { filly = {

View File

@ -19,10 +19,6 @@ in {
aliases = [ "amy.i" ]; aliases = [ "amy.i" ];
}; };
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.amy.nets.retiolum.ip4.addr
config.krebs.hosts.amy.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.181"; ip4.addr = "10.243.29.181";
aliases = [ "amy.r" ]; aliases = [ "amy.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -53,10 +49,6 @@ in {
aliases = [ "clara.i" ]; aliases = [ "clara.i" ];
}; };
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.clara.nets.retiolum.ip4.addr
config.krebs.hosts.clara.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.182"; ip4.addr = "10.243.29.182";
aliases = [ "clara.r" ]; aliases = [ "clara.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -130,10 +122,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.donna.nets.retiolum.ip4.addr
config.krebs.hosts.donna.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.180"; ip4.addr = "10.243.29.180";
aliases = [ "donna.r" ]; aliases = [ "donna.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -159,10 +147,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.herbert.nets.retiolum.ip4.addr
config.krebs.hosts.herbert.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.177"; ip4.addr = "10.243.29.177";
aliases = [ "herbert.r" ]; aliases = [ "herbert.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -178,40 +162,6 @@ in {
}; };
}; };
}; };
eddie = {
owner = config.krebs.users.mic92;
nets = rec {
internet = {
# eddie.thalheim.io
ip4.addr = "129.215.197.11";
aliases = [ "eddie.i" ];
};
retiolum = {
via = internet;
addrs = [
config.krebs.hosts.eddie.nets.retiolum.ip4.addr
config.krebs.hosts.eddie.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.170";
aliases = [ "eddie.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAuRQphRlSIC/aqRTfvStPdJOJCx1ACeFIDEjRdgoxuu32qoBl7i6d
j7Voh+Msditf2a5+f0fVsNDaPnjPGfk0NkZBjmn+RZQDRXk0krpTNj2Vb6W5quTm
3yrjJMFJR9CU5khfppc47X+ir8bjn7RusWTFNEuDvUswHmRmnJHLS3Y+utOaRbCF
2hxpyxCn423gpsaBfORPEK8X90nPbuNpFDugWPnC+R45TpNmIf4qyKvfhd9OKrua
KNanGHG30xhBW/DclUwwWi8D44d94xFnIRVcG1O+Uto93WoUWZn90lI1qywSj5Aq
iWstBK4tc7VwvAj0UzPlaRYYPfFjOEkPQzj8xC6l/leJcgxkup252uo6m1njMx3t
6QWMgevjqosY22OZReZfIwb14aDWFKLTWs30J+zmWK4TjlRITdsOEKxlpODMbJAD
kfSoPwuwkWIzFhNOrFiD/NtKaRYmV8bTBCT3a9cvvObshJx13BP+IUFzBS1N1n/u
hJWYH5WFsQZn/8rHDwZGkS1zKPEaNoydjqCZNyJpJ5nhggyl6gpuD7wpXM/8tFay
pAjRP40+qRQLUWXmswV0hsZTOX1tvZs4f68y3WJ+GwCWw9HvvwmzYes5ayJrPsbJ
lyK301Jb42wGEsVWxu3Eo/PLtp8OdD+Wdh6o/ELcc0k/YCUGFMujUM8CAwEAAQ==
-----END RSA PUBLIC KEY-----
'';
};
};
};
eve = { eve = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
@ -223,9 +173,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.eve.nets.retiolum.ip6.addr
];
aliases = [ "eve.r" ]; aliases = [ "eve.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -254,10 +201,6 @@ in {
okelmann = { okelmann = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets.retiolum = { nets.retiolum = {
addrs = [
config.krebs.hosts.okelmann.nets.retiolum.ip4.addr
config.krebs.hosts.okelmann.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.190"; ip4.addr = "10.243.29.190";
aliases = [ aliases = [
"okelmann.r" "okelmann.r"
@ -277,10 +220,6 @@ in {
aendernix = { aendernix = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets.retiolum = { nets.retiolum = {
addrs = [
config.krebs.hosts.aendernix.nets.retiolum.ip4.addr
config.krebs.hosts.aendernix.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.172"; ip4.addr = "10.243.29.172";
aliases = [ aliases = [
"aendernix.r" "aendernix.r"
@ -305,10 +244,6 @@ in {
aenderpad = { aenderpad = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets.retiolum = { nets.retiolum = {
addrs = [
config.krebs.hosts.aenderpad.nets.retiolum.ip4.addr
config.krebs.hosts.aenderpad.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.201"; ip4.addr = "10.243.29.201";
aliases = [ aliases = [
"aendernix.r" "aendernix.r"
@ -394,10 +329,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.martha.nets.retiolum.ip4.addr
config.krebs.hosts.martha.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.179"; ip4.addr = "10.243.29.179";
aliases = [ "martha.r" ]; aliases = [ "martha.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -454,10 +385,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.sauron.nets.retiolum.ip4.addr
config.krebs.hosts.sauron.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.194"; ip4.addr = "10.243.29.194";
aliases = [ "sauron.r" ]; aliases = [ "sauron.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -484,10 +411,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.bill.nets.retiolum.ip4.addr
config.krebs.hosts.bill.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.195"; ip4.addr = "10.243.29.195";
aliases = [ "bill.r" ]; aliases = [ "bill.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -519,10 +442,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.nardole.nets.retiolum.ip4.addr
config.krebs.hosts.nardole.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.173"; ip4.addr = "10.243.29.173";
aliases = [ "nardole.r" ]; aliases = [ "nardole.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -581,10 +500,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.rose.nets.retiolum.ip4.addr
config.krebs.hosts.rose.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.178"; ip4.addr = "10.243.29.178";
aliases = [ "rose.r" ]; aliases = [ "rose.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -610,7 +525,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.168";
aliases = [ aliases = [
"turingmachine.r" "turingmachine.r"
]; ];
@ -712,7 +626,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
ip4.addr = "10.243.29.185";
aliases = [ aliases = [
"eva.r" "eva.r"
"loki.r" "loki.r"
@ -743,10 +656,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.doctor.nets.retiolum.ip4.addr
config.krebs.hosts.doctor.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.186"; ip4.addr = "10.243.29.186";
aliases = [ "doctor.r" ]; aliases = [ "doctor.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -767,10 +676,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.bernie.nets.retiolum.ip4.addr
config.krebs.hosts.bernie.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.169"; ip4.addr = "10.243.29.169";
aliases = [ "bernie.r" ]; aliases = [ "bernie.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -805,10 +710,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.ryan.nets.retiolum.ip4.addr
config.krebs.hosts.ryan.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.198"; ip4.addr = "10.243.29.198";
aliases = [ "ryan.r" ]; aliases = [ "ryan.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -837,10 +738,6 @@ in {
}; };
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [
config.krebs.hosts.graham.nets.retiolum.ip4.addr
config.krebs.hosts.graham.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.199"; ip4.addr = "10.243.29.199";
aliases = [ "graham.r" ]; aliases = [ "graham.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -862,10 +759,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
addrs = [
config.krebs.hosts.maurice.nets.retiolum.ip4.addr
config.krebs.hosts.maurice.nets.retiolum.ip6.addr
];
ip4.addr = "10.243.29.200"; ip4.addr = "10.243.29.200";
aliases = [ "maurice.r" ]; aliases = [ "maurice.r" ];
tinc.pubkey = '' tinc.pubkey = ''
@ -882,5 +775,30 @@ in {
}; };
}; };
}; };
mickey = {
owner = config.krebs.users.mic92;
nets = rec {
retiolum = {
aliases = [ "mickey.r" ];
tinc.pubkey = ''
Ed25519PublicKey = cE450gYxzp9kAzV5ytU9N7aV+WdnD7wQMjkPWV7r/bC
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEA7TwI3/tyl3z46Enr6p/0bpl5CpG6DZLxjAhsMcWBM+4xTL9s18IZ
2FGbyS3EyOBprMBQULrik1u0rfZ0AL8XdO6h+r1BD6XmlZtUu3FJaVeXrLBPGtC0
qqC0mZOj1ezTl3kC9/O7slU1/vuIRWiiRuvmvLnc6uWo+ShTl8fs0a3rY7/FsFVY
ZClf2M/5cJmeZpwy+PvgGmhSvjflO5+v+C+LvvhfVzoLw2zf8Gbi23ifS0uhhJt2
9ztGnmQg+n4+EWEN3XFS1XXHO2P2jyy1ss5NrN0JrO/1J519owHXxbo096MV12xr
azD6of8k0xHbfW4PW0/U1qzs9Ra1T54D+xtnyemLOyeCApwUy+bSg+XuqMz1Wy55
dci7cBguTIn+pnJqcf8lGSfWDSxlBiwrbXSPszlRQ6vO8MA2uciSmOKodKtNj4bQ
5IfdHHOHGAuuE+ZNt6owc/8QzQ3dVT+fVmTeN1PB4FmPmF5E2kOpe4NebZ0DhD+g
+g/bNO5FFlIy2M+LKauIXugAHlrVrxl4blfjVkb9xrfsSJHQl8/G/F9zMUAzUBv3
W8cVFn9mAw0FFaQljs9iha92we6Vs93v+ZvsmSG2MVOYBVwka4FJ7kjaABLFXcjN
RA8gQM/P3j1EmDvemlskWOoCLVELR40BtKdM9MFiGqxGMoNh3DvGWTECAwEAAQ==
-----END RSA PUBLIC KEY-----
'';
};
};
};
}; };
} }

1
krebs/3modules/external/ssh/xkey.pub vendored Normal file
View File

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZFKgFcAEGXcsssJxDeUVvOTKD0U4LlT2Yw85+WmMTj

View File

@ -73,7 +73,7 @@ let
}; };
}; };
imp = { imp = mkMerge ([{
networking.firewall.enable = false; networking.firewall.enable = false;
systemd.services.krebs-iptables = { systemd.services.krebs-iptables = {
@ -97,7 +97,41 @@ let
unitConfig.DefaultDependencies = false; unitConfig.DefaultDependencies = false;
}; };
}; }] ++ compat);
compat = [
({
krebs.iptables.tables.filter.INPUT.rules = map
(port: { predicate = "-p tcp --dport ${toString port}"; target = "ACCEPT"; })
config.networking.firewall.allowedTCPPorts;
})
({
krebs.iptables.tables.filter.INPUT.rules = map
(port: { predicate = "-p udp --dport ${toString port}"; target = "ACCEPT"; })
config.networking.firewall.allowedUDPPorts;
})
({
krebs.iptables.tables.filter.INPUT.rules = map
(portRange: { predicate = "-p tcp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; })
config.networking.firewall.allowedTCPPortRanges;
})
({
krebs.iptables.tables.filter.INPUT.rules = map
(portRange: { predicate = "-p udp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; })
config.networking.firewall.allowedUDPPortRanges;
})
({
krebs.iptables.tables.filter.INPUT.rules = flatten (mapAttrsToList
(interface: interfaceConfig: [
(map (port: { predicate = "-i ${interface} -p tcp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPorts)
(map (port: { predicate = "-i ${interface} -p udp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPorts)
(map (portRange: { predicate = "-i ${interface} -p tcp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPortRanges)
(map (portRange: { predicate = "-i ${interface} -p udp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPortRanges)
])
config.networking.firewall.interfaces
);
})
];
#buildTable :: iptablesVersion -> iptablesAttrSet` -> str #buildTable :: iptablesVersion -> iptablesAttrSet` -> str
#todo: differentiate by iptables-version #todo: differentiate by iptables-version

View File

@ -76,10 +76,10 @@ in {
"agenda.r" "agenda.r"
"build.r" "build.r"
"build.hotdog.r" "build.hotdog.r"
"ca.r"
"cgit.hotdog.r" "cgit.hotdog.r"
"irc.r" "irc.r"
"wiki.r" "wiki.r"
"wiki.hotdog.r"
]; ];
tinc.port = 0; tinc.port = 0;
tinc.pubkey = '' tinc.pubkey = ''

View File

@ -19,7 +19,7 @@ let
marker = mkOption { marker = mkOption {
type = types.str; type = types.str;
default = "http://graph.r/marker.json"; default = "http://graph.r/network.json";
}; };
timerConfig = mkOption { timerConfig = mkOption {

64
krebs/3modules/ssl.nix Normal file
View File

@ -0,0 +1,64 @@
{ config, lib, pkgs, ... }: let
cfg = config.krebs.ssl;
in {
options.krebs.ssl = {
rootCA = lib.mkOption {
type = lib.types.str;
readOnly = true;
default = ''
-----BEGIN CERTIFICATE-----
MIIC0jCCAjugAwIBAgIJAKeARo6lDD0YMA0GCSqGSIb3DQEBBQUAMIGBMQswCQYD
VQQGEwJaWjESMBAGA1UECAwJc3RhdGVsZXNzMRAwDgYDVQQKDAdLcmVic2NvMQsw
CQYDVQQLDAJLTTEWMBQGA1UEAwwNS3JlYnMgUm9vdCBDQTEnMCUGCSqGSIb3DQEJ
ARYYcm9vdC1jYUBzeW50YXgtZmVobGVyLmRlMB4XDTE0MDYxMTA4NTMwNloXDTM5
MDIwMTA4NTMwNlowgYExCzAJBgNVBAYTAlpaMRIwEAYDVQQIDAlzdGF0ZWxlc3Mx
EDAOBgNVBAoMB0tyZWJzY28xCzAJBgNVBAsMAktNMRYwFAYDVQQDDA1LcmVicyBS
b290IENBMScwJQYJKoZIhvcNAQkBFhhyb290LWNhQHN5bnRheC1mZWhsZXIuZGUw
gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMs/WNyeQziccllLqom7bfCjlh6/
/qx9p6UOqpw96YOOT3sh/mNSBLyNxIUJbWsU7dN5hT7HkR7GwzpfKDtudd9qiZeU
QNYQ+OL0HdOnApjdPqdspZfKxKTXyC1T1vJlaODsM1RBrjLK9RUcQZeNhgg3iM9B
HptOCrMI2fjCdZuVAgMBAAGjUDBOMB0GA1UdDgQWBBSKeq01+rAwp7yAXwzlwZBo
3EGVLzAfBgNVHSMEGDAWgBSKeq01+rAwp7yAXwzlwZBo3EGVLzAMBgNVHRMEBTAD
AQH/MA0GCSqGSIb3DQEBBQUAA4GBAIWIffZuQ43ddY2/ZnjAxPCRpM3AjoKIwEj9
GZuLJJ1sB9+/PAPmRrpmUniRkPLD4gtmolDVuoLDNAT9os7/v90yg5dOuga33Ese
725musUbhEoQE1A1oVHrexBs2sQOplxHKsVXoYJp2/trQdqvaNaEKc3EeVnzFC63
80WiO952
-----END CERTIFICATE-----
'';
};
intermediateCA = lib.mkOption {
type = lib.types.str;
readOnly = true;
default = builtins.readFile ../6assets/krebsAcmeCA.crt;
};
acmeURL = lib.mkOption {
type = lib.types.str;
readOnly = true;
default = "https://ca.r/acme/acme/directory";
};
trustRoot = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
whether to trust the krebs root CA.
This implies that krebs can forge a certficate for every domain
'';
};
trustIntermediate = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
whether to trust the krebs ACME CA.
this only trusts the intermediate cert for .w and .r domains
'';
};
};
config = lib.mkMerge [
(lib.mkIf cfg.trustRoot {
security.pki.certificates = [ cfg.rootCA ];
})
(lib.mkIf cfg.trustIntermediate {
security.pki.certificates = [ cfg.intermediateCA ];
})
];
}

View File

@ -17,7 +17,6 @@ let
in { in {
enable = mkEnableOption "krebs.tinc.${netname}" // { default = true; }; enable = mkEnableOption "krebs.tinc.${netname}" // { default = true; };
enableLegacy = mkEnableOption "/etc/tinc/${netname}";
confDir = mkOption { confDir = mkOption {
type = types.package; type = types.package;
@ -102,7 +101,7 @@ let
tincPackage = mkOption { tincPackage = mkOption {
type = types.package; type = types.package;
default = pkgs.tinc; default = pkgs.tinc_pre;
description = "Tincd package to use."; description = "Tincd package to use.";
}; };
@ -263,9 +262,9 @@ let
) config.krebs.tinc; ) config.krebs.tinc;
environment.etc = mapAttrs' (netname: cfg: environment.etc = mapAttrs' (netname: cfg:
nameValuePair "tinc/${netname}" (mkIf cfg.enableLegacy { nameValuePair "tinc/${netname}" {
source = cfg.confDir; source = cfg.confDir;
}) }
) config.krebs.tinc; ) config.krebs.tinc;
systemd.services = mapAttrs (netname: cfg: systemd.services = mapAttrs (netname: cfg:
@ -287,9 +286,12 @@ let
]; ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ tinc iproute ]; path = [ tinc iproute ];
reloadIfChanged = true;
restartTriggers = [ cfg.confDir ];
serviceConfig = rec { serviceConfig = rec {
Restart = "always"; Restart = "always";
ExecStart = "${tinc}/sbin/tincd -c ${cfg.confDir} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid"; ExecStart = "${tinc}/sbin/tincd -c /etc/tinc/${netname} -d 0 -U ${cfg.user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
ExecReload = "${tinc}/sbin/tinc -n ${netname} reload";
SyslogIdentifier = netname; SyslogIdentifier = netname;
}; };
} }

View File

@ -7,12 +7,12 @@
}: }:
mkDerivation rec { mkDerivation rec {
pname = "brockman"; pname = "brockman";
version = "4.0.1"; version = "4.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kmein"; owner = "kmein";
repo = "brockman"; repo = "brockman";
rev = version; rev = version;
sha256 = "0hppgban8hfyhn4c8qgm8j7ml6jaa35pjgrv3k3q27ln71wnr8rz"; sha256 = "sha256-EKXKhGdIJRbRklD5zxJNGhOxqPzog4f9NMXo/c8iBGc=";
}; };
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;

View File

@ -1,34 +0,0 @@
{ pkgs, fetchFromGitHub, python2Packages, git, ... }: let
# we need the old sqlparse since the new one is python2 incompatible
sqlparse = python2Packages.callPackage ./sqlparse.nix {};
in python2Packages.buildPythonApplication rec {
name = "buildbot-classic-${version}";
version = "0.8.18";
namePrefix = "";
patches = [];
src = fetchFromGitHub {
owner = "krebs";
repo = "buildbot-classic";
rev = version;
sha256 = "0b4y3n9zd2gdy8xwk1vpvs4n9fbg72vi8mx4ydgijwngcmdqkjmq";
};
postUnpack = "sourceRoot=\${sourceRoot}/master";
propagatedBuildInputs = [
python2Packages.jinja2
python2Packages.twisted
python2Packages.dateutil
(python2Packages.sqlalchemy_migrate.override { sqlparse = sqlparse; })
python2Packages.pysqlite
pkgs.coreutils
];
doCheck = false;
postInstall = ''
mkdir -p "$out/share/man/man1"
cp docs/buildbot.1 "$out/share/man/man1"
'';
}

View File

@ -1,34 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, isPy3k
}:
buildPythonPackage rec {
pname = "sqlparse";
version = "0.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548";
};
checkInputs = [ pytest ];
checkPhase = ''
py.test
'';
# Package supports 3.x, but tests are clearly 2.x only.
doCheck = !isPy3k;
meta = with lib; {
description = "Non-validating SQL parser for Python";
longDescription = ''
Provides support for parsing, splitting and formatting SQL statements.
'';
homepage = "https://github.com/andialbrecht/sqlparse";
license = licenses.bsd3;
};
}

View File

@ -0,0 +1,30 @@
{ pkgs }:
pkgs.writers.writeDashBin "generate-intermediate-ca" ''
TMPDIR=$(mktemp -d)
trap "rm -rf $TMPDIR;" INT TERM EXIT
mkdir -p "$TMPDIR/krebs"
brain show ca/ca.key > "$TMPDIR/krebs/ca.key"
brain show ca/ca.crt > "$TMPDIR/krebs/ca.crt"
export STEPPATH="$TMPDIR/step"
cat << EOF > "$TMPDIR/intermediate.tpl"
{
"subject": {{ toJson .Subject }},
"keyUsage": ["certSign", "crlSign"],
"basicConstraints": {
"isCA": true,
"maxPathLen": 0
},
"nameConstraints": {
"critical": true,
"permittedDNSDomains": ["r" ,"w"]
}
}
EOF
${pkgs.step-cli}/bin/step certificate create "Krebs ACME CA" intermediate_ca.crt intermediate_ca.key \
--template "$TMPDIR/intermediate.tpl" \
--not-after 8760h \
--ca "$TMPDIR/krebs/ca.crt" \
--ca-key "$TMPDIR/krebs/ca.key" \
--no-password --insecure
''

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rss-bridge"; pname = "rss-bridge";
version = "unstable-2021-04-20"; version = "unstable-2021-12-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RSS-Bridge"; owner = "RSS-Bridge";
repo = "rss-bridge"; repo = "rss-bridge";
rev = "716f5ddc0e20c10cb77ded46380cc376913a92fd"; rev = "f469489b569d22fb5edbd13c6e5f5abf2a4ee186";
sha256 = "17aqmj7rz0ysk8nj4kbjvnsjdm47d0xsypfygzzk2vagxfz5w3p8"; sha256 = "sha256-LyxcycXbOFZR0mMDMUqAOjWrHIE2ftxkAYUGBbcQF5k==";
}; };
patchPhase = '' patchPhase = ''

View File

@ -0,0 +1,15 @@
-----BEGIN CERTIFICATE-----
MIICWTCCAcKgAwIBAgIQbAfVX2J0VIzhEYSPVAB4SzANBgkqhkiG9w0BAQsFADCB
gTELMAkGA1UEBhMCWloxEjAQBgNVBAgMCXN0YXRlbGVzczEQMA4GA1UECgwHS3Jl
YnNjbzELMAkGA1UECwwCS00xFjAUBgNVBAMMDUtyZWJzIFJvb3QgQ0ExJzAlBgkq
hkiG9w0BCQEWGHJvb3QtY2FAc3ludGF4LWZlaGxlci5kZTAeFw0yMTEyMTAwODQ5
MDZaFw0yMjEyMTAwODQ5MDZaMBgxFjAUBgNVBAMTDUtyZWJzIEFDTUUgQ0EwWTAT
BgcqhkjOPQIBBggqhkjOPQMBBwNCAATL8dNO7ajNe60Km7wHrG06tCUj5kQKWsrQ
Ay7KX8zO+RwQpYhd/i4bqpeGkGWh8uHLZ+164FlZaLgHO10DRja5o4GAMH4wDgYD
VR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFMt9yJED
mPRhXsrNZ0x+GtzjdnTLMB8GA1UdIwQYMBaAFIp6rTX6sDCnvIBfDOXBkGjcQZUv
MBgGA1UdHgEB/wQOMAygCjADggFyMAOCAXcwDQYJKoZIhvcNAQELBQADgYEANo/2
teIuEsniwxVdqu+ukjqOXHIkBK7F91+G7BuDjBlx2U96v1MwsmT4D9upajERnOOD
tLx990Sj4t3avRTpytt+qLeIMIxt62YksUXVjDWndqaDcEUat5ZVEQsZ0ZmjOHrA
BaB65eU0xhJWKAZdk55GqHEFz3Ym4rx7WUaomzk=
-----END CERTIFICATE-----

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
"date": "2021-12-07T01:07:01+09:00", "date": "2021-12-12T23:14:25+01:00",
"path": "/nix/store/3z2f4r7kfkma94zwf083x7cvq8nypw42-nixpkgs", "path": "/nix/store/cdc72gqrly2dn2x1nb8xhnmw1q68f8zr-nixpkgs",
"sha256": "0c5qjrmh1k2zr15x2i9cp6n1r2pvrlk7hdyfvrwzpk963gc9ssmz", "sha256": "0l123s468r9h706grqkzf0x077r4hy6zcz529xxfiqxsh1ddx5xb",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "rev": "573095944e7c1d58d30fc679c81af63668b54056",
"date": "2021-12-07T15:25:15+01:00", "date": "2021-12-10T10:33:46-08:00",
"path": "/nix/store/4gssny5dsr4w6p5v7mni9xl7xs5fkv3c-nixpkgs", "path": "/nix/store/c0bvhzf1xsjrmzrda8jasa1da76x0zyk-nixpkgs",
"sha256": "1fx6nqz8x9biwlwsnh67z5qz0fmrdgr01yvmdw2cw9xjx8hyss3s", "sha256": "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

View File

@ -14,7 +14,6 @@
}; };
krebs.tinc.retiolum = { krebs.tinc.retiolum = {
enableLegacy = true;
enable = true; enable = true;
connectTo = [ connectTo = [
"prism" "prism"

View File

@ -227,6 +227,7 @@ rec {
services.phpfpm.pools."${domain}" = { services.phpfpm.pools."${domain}" = {
user = "nginx"; user = "nginx";
group = "nginx"; group = "nginx";
phpPackage = pkgs.php74;
extraConfig = '' extraConfig = ''
listen = /srv/http/${domain}/phpfpm.pool listen = /srv/http/${domain}/phpfpm.pool
pm = dynamic pm = dynamic

View File

@ -46,7 +46,9 @@ in {
-f '<nixpkgs/nixos>' config.system.build.toplevel \ -f '<nixpkgs/nixos>' config.system.build.toplevel \
-o "$outDir/out" -o "$outDir/out"
$outDir/out/bin/switch-to-configuration switch nix-env -p /nix/var/nix/profiles/system --set "$outDir/out"
"$outDir/out/bin/switch-to-configuration" switch
''; '';
source = source { test = false; }; source = source { test = false; };
allocateTTY = true; allocateTTY = true;

View File

@ -94,7 +94,7 @@ in {
<stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.nix> <stockholm/makefu/2configs/bluetooth-mpd.nix>
<stockholm/makefu/2configs/home/airsonic.nix> <stockholm/makefu/2configs/home/music.nix>
<stockholm/makefu/2configs/home/photoprism.nix> <stockholm/makefu/2configs/home/photoprism.nix>
# <stockholm/makefu/2configs/home/metube.nix> # <stockholm/makefu/2configs/home/metube.nix>
<stockholm/makefu/2configs/home/ham> <stockholm/makefu/2configs/home/ham>

View File

@ -1,12 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG";
systemd.services.restart-brockman = {
after = [ "brockman.service" ];
wantedBy = [ "multi-user.target" ];
startAt = "daily";
script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service";
};
krebs.brockman = { krebs.brockman = {
enable = true; enable = true;
config = { config = {
@ -34,7 +28,7 @@
bgt-twitter = { bgt-twitter = {
feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=binaergewitter&format=Atom"; feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=binaergewitter&format=Atom";
#extraChannels = [ "#binaergewitter" ]; #extraChannels = [ "#binaergewitter" ];
delay = 180; delay = 280;
}; };
}; };
}; };

View File

@ -6,22 +6,9 @@
services.nix-serve = { services.nix-serve = {
enable = true; enable = true;
port = 5001; port = 5001;
secretKeyFile = config.krebs.secret.files.nix-serve-key.path; secretKeyFile = toString <secrets> + "/nix-serve.key";
}; };
systemd.services.nix-serve = {
after = [
config.krebs.secret.files.nix-serve-key.service
];
partOf = [
config.krebs.secret.files.nix-serve-key.service
];
};
krebs.secret.files.nix-serve-key = {
path = "/run/secret/nix-serve.key";
owner.name = "nix-serve";
source-path = toString <secrets> + "/nix-serve.key";
};
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts."cache.euer.krebsco.de" = { virtualHosts."cache.euer.krebsco.de" = {

View File

@ -2,7 +2,7 @@
let let
port = 8812; port = 8812;
in { in {
services.bitwarden_rs = { services.vaultwarden = {
enable = true; enable = true;
dbBackend = "postgresql"; dbBackend = "postgresql";
config.signups_allowed = false; config.signups_allowed = false;
@ -13,17 +13,15 @@ in {
config.websocket_enabled = true; config.websocket_enabled = true;
}; };
systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; systemd.services.vaultwarden.after = [ "postgresql.service" ];
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "bitwarden" ]; ensureDatabases = [ "bitwarden" ];
ensureUsers = [ { name = "bitwarden_rs"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; } ]; ensureUsers = [
#initialScript = pkgs.writeText "postgresql-init.sql" '' { name = "bitwarden_rs"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; }
# CREATE DATABASE bitwarden; { name = "vaultwarden"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; }
# CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; ];
# GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser;
#'';
}; };
services.nginx.virtualHosts."bw.euer.krebsco.de" ={ services.nginx.virtualHosts."bw.euer.krebsco.de" ={

View File

@ -63,8 +63,11 @@ in {
networking.firewall.extraCommands = '' networking.firewall.extraCommands = ''
iptables -A PREROUTING -t nat -i ${ext-if} -p tcp --dport 411 -j REDIRECT --to-port 1511 iptables -A PREROUTING -t nat -i ${ext-if} -p tcp --dport 411 -j REDIRECT --to-port 1511
''; '';
systemd.services.uhub.serviceConfig = { systemd.services.uhub-home.serviceConfig = {
PrivateTmp = true; PrivateTmp = true;
DynamicUser = lib.mkForce false;
User = "uhub";
WorkingDirectory = uhubDir;
PermissionsStartOnly = true; PermissionsStartOnly = true;
ExecStartPre = pkgs.writeDash "uhub-pre" '' ExecStartPre = pkgs.writeDash "uhub-pre" ''
cp -f ${toString <secrets/wildcard.krebsco.de.crt>} ${uhubDir}/uhub.crt cp -f ${toString <secrets/wildcard.krebsco.de.crt>} ${uhubDir}/uhub.crt
@ -86,6 +89,7 @@ in {
group = "uhub"; group = "uhub";
}; };
users.groups.uhub = {}; users.groups.uhub = {};
services.uhub.home = { services.uhub.home = {
enable = true; enable = true;
enableTLS = true; enableTLS = true;
@ -103,13 +107,12 @@ in {
} }
{ {
plugin = "${pkgs.uhub}/plugins/mod_welcome.so"; plugin = "${pkgs.uhub}/plugins/mod_welcome.so";
settings.motd = "shareit"; settings.motd = toString (pkgs.writeText "motd" "shareit");
settings.rules = "1. Don't be an asshole"; settings.rules = toString (pkgs.writeText "rules" "1. Don't be an asshole");
} }
{ {
plugin = "${pkgs.uhub}/plugins/mod_history.so"; plugin = "${pkgs.uhub}/plugins/mod_chat_history.so";
settings.motd = "shareit"; settings = {};
settings.rules = "1. Don't be an asshole";
} }
]; ];
}; };

View File

@ -49,7 +49,7 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud21; package = pkgs.nextcloud22;
hostName = "o.euer.krebsco.de"; hostName = "o.euer.krebsco.de";
# Use HTTPS for links # Use HTTPS for links
https = true; https = true;

View File

@ -12,15 +12,15 @@
omitPasswordAuth = false; omitPasswordAuth = false;
users.sensor = { users.sensor = {
hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg=="; hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
acl = [ "topic readwrite #" ]; acl = [ "readwrite #" ];
}; };
users.hass = { users.hass = {
hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA=="; hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA==";
acl = [ "topic readwrite #" ]; acl = [ "readwrite #" ];
}; };
users.stats = { users.stats = {
hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA=="; hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA==";
acl = [ "topic read #" ]; acl = [ "read #" ];
}; };
settings = { settings = {
allow_anonymous = false; allow_anonymous = false;

View File

@ -1,19 +1,21 @@
{ config, ... }: { config, ... }:
let let
internal-ip = "192.168.111.11"; internal-ip = "192.168.111.11";
port = 4040; port = 4533;
in in
{ {
# networking.firewall.allowedTCPPorts = [ 4040 ]; services.navidrome.enable = true;
services.airsonic = { services.navidrome.settings = {
enable = true; MusicFolder = "/media/cryptX/music";
listenAddress = "0.0.0.0"; Address = "0.0.0.0";
inherit port;
}; };
state = [ config.services.airsonic.home ];
services.nginx.virtualHosts."airsonic" = { state = [ "/var/lib/navidrome" ];
# networking.firewall.allowedTCPPorts = [ 4040 ];
# state = [ config.services.airsonic.home ];
services.nginx.virtualHosts."navidrome" = {
serverAliases = [ serverAliases = [
"airsonic.lan" "navidrome.lan"
"music" "music.lan" "music" "music.lan"
"musik" "musik.lan" "musik" "musik.lan"
]; ];

View File

@ -7,13 +7,6 @@
virtualHost = "rss.makefu.r"; virtualHost = "rss.makefu.r";
}; };
systemd.services.restart-brockman = {
after = [ "brockman.service" ];
wantedBy = [ "multi-user.target" ];
startAt = "daily";
script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service";
};
krebs.brockman = { krebs.brockman = {
enable = true; enable = true;
config = { config = {
@ -27,11 +20,11 @@
bots = { bots = {
r-systemdultras-rss = { r-systemdultras-rss = {
feed = "https://www.reddit.com/r/systemdultras/.rss"; feed = "https://www.reddit.com/r/systemdultras/.rss";
delay = 136; delay = 236;
}; };
r-systemd-rss = { r-systemd-rss = {
feed = "https://www.reddit.com/r/systemd/.rss"; feed = "https://www.reddit.com/r/systemd/.rss";
delay = 172; delay = 272;
}; };
r-pid_eins-twitter = { r-pid_eins-twitter = {
feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=pid_eins&format=Atom"; feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=pid_eins&format=Atom";