summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/backup.nix25
-rw-r--r--tv/2configs/charybdis.nix5
-rw-r--r--tv/2configs/default.nix16
-rw-r--r--tv/2configs/exim-retiolum.nix4
-rw-r--r--tv/2configs/exim-smarthost.nix2
-rw-r--r--tv/2configs/git.nix2
-rw-r--r--tv/2configs/hw/AO753.nix2
-rw-r--r--tv/2configs/nginx-public_html.nix4
-rw-r--r--tv/2configs/pulse.nix2
-rw-r--r--tv/2configs/retiolum.nix2
-rw-r--r--tv/2configs/urlwatch.nix3
-rw-r--r--tv/2configs/vim.nix4
-rw-r--r--tv/2configs/xserver/Xresources.nix2
-rw-r--r--tv/2configs/xserver/default.nix2
-rw-r--r--tv/2configs/xserver/xserver.conf.nix2
-rw-r--r--tv/2configs/xu-qemu0.nix243
16 files changed, 298 insertions, 22 deletions
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index 6c90709a8..641e2d586 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -1,5 +1,5 @@
{ config, lib, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.backup.plans = {
wu-home-xu = {
@@ -26,5 +26,28 @@ with lib;
yearly = { format = "%Y"; };
};
};
+ } // mapAttrs (_: recursiveUpdate {
+ snapshots = {
+ minutely = { format = "%Y-%m-%dT%H:%M"; retain = 3; };
+ hourly = { format = "%Y-%m-%dT%H"; retain = 3; };
+ daily = { format = "%Y-%m-%d"; retain = 3; };
+ };
+ startAt = null;
+ }) {
+ xu-test-push-xu = {
+ method = "push";
+ src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; };
+ dst = { host = config.krebs.hosts.xu; path = "/bku/xu-test-push"; };
+ };
+ xu-test-pull-xu = {
+ method = "pull";
+ src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; };
+ dst = { host = config.krebs.hosts.xu; path = "/bku/xu-test-pull"; };
+ };
+ xu-test-push-wu = {
+ method = "push";
+ src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; };
+ dst = { host = config.krebs.hosts.wu; path = "/bku/xu-test-push"; };
+ };
};
}
diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix
index f9ab3da68..eefb2810b 100644
--- a/tv/2configs/charybdis.nix
+++ b/tv/2configs/charybdis.nix
@@ -1,13 +1,12 @@
{ config, lib, pkgs, ... }:
-with builtins;
-with lib;
+with config.krebs.lib;
let
cfg = config.tv.charybdis;
out = {
options.tv.charybdis = api;
- config = mkIf cfg.enable (mkMerge [
+ config = lib.mkIf cfg.enable (lib.mkMerge [
imp
{ tv.iptables.input-retiolum-accept-new-tcp = [ 6667 6697 ]; }
]);
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b5639af51..c4a2d6baa 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.enable = true;
@@ -9,12 +9,10 @@ with lib;
user = config.krebs.users.tv;
source = mapAttrs (_: mkDefault) ({
nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
- nixpkgs = symlink:stockholm/nixpkgs;
secrets = "/home/tv/secrets/${config.krebs.build.host.name}";
secrets-common = "/home/tv/secrets/common";
stockholm = "/home/tv/stockholm";
- stockholm-user = "symlink:stockholm/tv";
- upstream-nixpkgs = {
+ nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";
dev = "/home/tv/nixpkgs";
@@ -44,6 +42,7 @@ with lib;
tv = {
isNormalUser = true;
uid = 1337;
+ extraGroups = [ "tv" ];
};
};
};
@@ -184,6 +183,15 @@ with lib;
];
}
{
+ environment.systemPackages = [
+ pkgs.get
+ pkgs.krebszones
+ pkgs.nix-prefetch-scripts
+ pkgs.push
+ ];
+ }
+
+ {
systemd.tmpfiles.rules = let
forUsers = flip map users;
isUser = { name, group, ... }:
diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
index aedf25823..9197a3c30 100644
--- a/tv/2configs/exim-retiolum.nix
+++ b/tv/2configs/exim-retiolum.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.exim-retiolum.enable = true;
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index bcfea7821..4b49e20b1 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.exim-smarthost = {
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index f248a8cb5..7a42ca9fa 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index e7a2b9238..b81b773be 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
imports = [
diff --git a/tv/2configs/nginx-public_html.nix b/tv/2configs/nginx-public_html.nix
index dc74f7f8d..15a3b5482 100644
--- a/tv/2configs/nginx-public_html.nix
+++ b/tv/2configs/nginx-public_html.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.nginx = {
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index e1894ca64..8e611f21e 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
pkg = pkgs.pulseaudioLight;
runDir = "/run/pulse";
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index d2bb9e6cf..e1598d792 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -1,6 +1,6 @@
{ config, lib, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.retiolum = {
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 8189f6345..0106cddf7 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -51,6 +51,9 @@
# <stockholm/tv/2configs/xserver/xserver.conf.nix>
# is derived from `configFile` in:
https://raw.githubusercontent.com/NixOS/nixpkgs/master/nixos/modules/services/x11/xserver.nix
+
+ https://pypi.python.org/pypi/vncdotool
+ https://api.github.com/repos/kanaka/noVNC/tags
];
};
}
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 69a880dab..b0c26e50e 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
out = {
environment.systemPackages = [
diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix
index f287bf206..923572721 100644
--- a/tv/2configs/xserver/Xresources.nix
+++ b/tv/2configs/xserver/Xresources.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
pkgs.writeText "Xresources" ''
!URxvt*background: #050505
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 5cd17aa1d..4b936f473 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }@args:
-with lib;
+with config.krebs.lib;
let
# TODO krebs.build.user
diff --git a/tv/2configs/xserver/xserver.conf.nix b/tv/2configs/xserver/xserver.conf.nix
index e8a997a99..c452b4226 100644
--- a/tv/2configs/xserver/xserver.conf.nix
+++ b/tv/2configs/xserver/xserver.conf.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
cfg = config.services.xserver;
diff --git a/tv/2configs/xu-qemu0.nix b/tv/2configs/xu-qemu0.nix
new file mode 100644
index 000000000..720a8acd8
--- /dev/null
+++ b/tv/2configs/xu-qemu0.nix
@@ -0,0 +1,243 @@
+{ config, lib, pkgs, ... }:
+
+let
+ # XXX cannot use config.build.host.name here because infinite recursion when
+ # defining krebs.hosts.${host-name}.nets.retiolum.aliases below.
+ host-name = "xu";
+in
+
+# usage:
+# echo set_password vnc correcthorze | xu-qemu0-monitor
+#
+# vncdo -s xu:1 type 'curl init.xu.r' key shift-\\ type sh key return
+#
+# http://vnc.xu/vnc_auto.html?port=5701&host=xu&password=correcthorze
+#
+# make [install] system=xu-qemu0 target_host=10.56.0.101
+
+# TODO iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+# TODO iptables -A FORWARD -i qemubr0 -s 10.56.0.1/24 -m conntrack --ctstate NEW -j ACCEPT
+# TODO iptables -A POSTROUTING -t nat -j MASQUERADE
+# TODO iptables -A INPUT -i qemubr0 -p udp -m udp --dport bootps -j ACCEPT
+# TODO iptables -A INPUT -i qemubr0 -p udp -m udp --dport domain -j ACCEPT
+
+with config.krebs.lib;
+
+{
+ networking.dhcpcd.denyInterfaces = [ "qemubr0" ];
+
+ systemd.network.enable = true;
+ services.resolved.enable = mkForce false;
+
+ boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
+
+ systemd.network.networks.qemubr0 = {
+ matchConfig.Name = "qemubr0";
+ address = ["10.56.0.1/24"];
+ routes = [{
+ routeConfig = {
+ Gateway = "*";
+ Destination = "10.56.0.0";
+ };
+ }];
+ };
+ systemd.network.netdevs.qemubr0 = {
+ netdevConfig = {
+ Name = "qemubr0";
+ Kind = "bridge";
+ };
+ };
+
+ users.groups.qemu-users.gid = genid "qemu-users";
+
+ environment.etc."qemu/bridge.conf".text = ''
+ allow qemubr0
+ '';
+
+ krebs.per-user.tv.packages = [
+ pkgs.vncdotool
+ ];
+
+ users.users.xu-qemu0 = {
+ createHome = true;
+ group = "qemu-users";
+ home = "/home/xu-qemu0";
+ uid = genid "xu-qemu0";
+ };
+
+ systemd.services.xu-qemu0 = let
+ in {
+ after = [ "network.target" "systemd-resolved.service" ];
+ serviceConfig = {
+ User = "xu-qemu0";
+ SyslogIdentifier = "xu-qemu0";
+ ExecStart = pkgs.writeDash "xu-qemu0" ''
+ set -efu
+ ${pkgs.coreutils}/bin/mkdir -p "$HOME/tmp"
+ img=$HOME/tmp/xu-qemu0.raw
+ if ! test -e "$img"; then
+ ${pkgs.kvm}/bin/qemu-img create "$img" 10G
+ fi
+ exec ${pkgs.kvm}/bin/qemu-kvm \
+ -monitor unix:$HOME/tmp/xu-qemu0-monitor.sock,server,nowait \
+ -boot order=cd \
+ -cdrom ${pkgs.fetchurl {
+ url = https://nixos.org/releases/nixos/15.09/nixos-15.09.1012.9fe0c23/nixos-minimal-15.09.1012.9fe0c23-x86_64-linux.iso;
+ sha256 = "18bc9wrsrjnhj9rya75xliqkl99gxbsk4dmwqivhvwfzb5qb5yp9";
+ }} \
+ -m 1024 \
+ -netdev bridge,br=qemubr0,id=hn0,helper=/var/setuid-wrappers/qemu-bridge-helper \
+ -net nic,netdev=hn0,id=nic1,macaddr=52:54:00:12:34:56 \
+ -drive file="$img",format=raw \
+ -display vnc=:1,websocket=5701,password,lossy \
+ -name xu-qemu0 \
+ '';
+ };
+ };
+
+ krebs.setuid.xu-qemu0-monitor = {
+ filename = pkgs.writeDash "xu-qemu0-monitor" ''
+ exec ${pkgs.socat}/bin/socat \
+ stdio \
+ UNIX-CONNECT:${config.users.users.xu-qemu0.home}/tmp/xu-qemu0-monitor.sock \
+ '';
+ owner = "xu-qemu0";
+ group = "tv";
+ };
+
+ krebs.setuid.qemu-bridge-helper = {
+ filename = "${pkgs.qemu}/libexec/qemu-bridge-helper";
+ group = "qemu-users";
+ };
+
+ users.users.qemu-dnsmasq.uid = genid "qemu-dnsmasq";
+
+ # TODO need custom etc/dbus-1/system.d/dnsmasq.conf for different BusName
+ services.dbus.packages = [ pkgs.dnsmasq ];
+
+ systemd.services.qemu-dnsmasq = let
+ # bind-interfaces
+ conf = pkgs.writeText "qemu-dnsmasq.conf" ''
+ listen-address=10.56.0.1
+ interface=qemubr0
+ dhcp-range=10.56.0.200,10.56.0.250
+ dhcp-no-override
+ dhcp-leasefile=/tmp/qemu-dnsmasq.leases
+ domain=${host-name}.local
+ dhcp-host=52:54:00:12:34:56,xu-qemu0,10.56.0.101,1440m
+ '';
+ in {
+ after = [ "network.target" "systemd-resolved.service" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "dbus";
+ BusName = "uk.org.thekelleys.dnsmasq";
+ # -1 --enable-dbus[=uk.org.thekelleys.dnsmasq]
+ SyslogIdentifier = "qemu-dnsmasq";
+ ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq -1k -u qemu-dnsmasq -C ${conf}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ PrivateTmp = "true";
+ };
+ restartTriggers = [ config.environment.etc.hosts.source ];
+ };
+
+
+ krebs.nginx.servers.init = {
+ server-names = [
+ "init.${host-name}"
+ "init.${host-name}.r"
+ "init.${host-name}.retiolum"
+ ];
+ extraConfig = ''
+ index init.txt;
+ root ${pkgs.writeTextFile {
+ name = "init-pages";
+ text = ''
+ #! /bin/sh
+ set -efu
+
+ dev=/dev/sda
+ pttype=dos # gpt
+
+ case $pttype in
+ dos)
+ if ! test "$(blkid -o value -s PTTYPE "$dev")" = dos; then
+ parted -s "$dev" mklabel msdos
+ fi
+ if ! test "$(blkid -o value -s PARTLABEL "$dev"1)" = primary; then
+ parted -s "$dev" mkpart primary ext4 1MiB 513MiB
+ parted -s "$dev" set 1 boot on
+ fi
+ ;;
+ gpt)
+ if ! test "$(blkid -o value -s PTTYPE "$dev")" = gpt; then
+ parted -s "$dev" mklabel gpt
+ fi
+ if ! test "$(blkid -o value -s PARTLABEL "$dev"1)" = ESP; then
+ parted -s "$dev" mkpart ESP fat32 1MiB 513MiB
+ parted -s "$dev" set 1 boot on
+ fi
+ ;;
+ *)
+ echo "Error: bad pttype: $pttype" >&2
+ exit -1
+ esac
+
+ if ! test "$(blkid -o value -s PARTLABEL "$dev"2)" = primary; then
+ parted -s "$dev" mkpart primary btrfs 513MiB 100%
+ fi
+ if ! test "$(blkid -o value -s TYPE "$dev"1)" = vfat; then
+ mkfs.vfat "$dev"1
+ fi
+ if ! test "$(blkid -o value -s TYPE "$dev"2)" = btrfs; then
+ mkfs.btrfs "$dev"2
+ fi
+
+ parted "$dev" print
+
+ if ! test "$(lsblk -n -o MOUNTPOINT "$dev"2)" = /mnt; then
+ mount "$dev"2 /mnt
+ fi
+ if ! test "$(lsblk -n -o MOUNTPOINT "$dev"1)" = /mnt/boot; then
+ mkdir -m 0000 -p /mnt/boot
+ mount "$dev"1 /mnt/boot
+ fi
+
+ lsblk "$dev"
+
+ key=${shell.escape config.krebs.users.tv-xu.pubkey}
+
+ if [ "$(cat /root/.ssh/authorized_keys 2>/dev/null)" != "$key" ]; then
+ mkdir -p /root/.ssh
+ echo "$key" > /root/.ssh/authorized_keys
+ fi
+ systemctl start sshd
+ ip route
+ echo READY.
+ '';
+ destination = "/init.txt";
+ }};
+ '';
+ };
+
+
+ krebs.hosts.${host-name}.nets.retiolum.aliases = [
+ "init.${host-name}.r"
+ "init.${host-name}.retiolum"
+ "vnc.${host-name}.r"
+ "vnc.${host-name}.retiolum"
+ ];
+
+ krebs.nginx.servers.noVNC = {
+ server-names = [
+ "vnc.${host-name}"
+ "vnc.${host-name}.r"
+ "vnc.${host-name}.retiolum"
+ ];
+ #rewrite ^([^.]*)$ /vnc_auto.html?host=localhost&port=5701;
+ locations = singleton (nameValuePair "/" ''
+ index vnc.html;
+ root ${pkgs.noVNC};
+ '');
+ };
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:07:10 +0000