diff options
Diffstat (limited to 'makefu')
69 files changed, 858 insertions, 1103 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 36af23bb5..3d2cbac6f 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -8,16 +8,21 @@ in { imports = [ <stockholm/makefu> ./hardware-config.nix + { + users.users.lass = { + uid = 9002; + isNormalUser = true; + createHome = true; + useDefaultShell = true; + openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + makefu.pubkey + ]; + }; + } <stockholm/makefu/2configs/headless.nix> # <stockholm/makefu/2configs/smart-monitor.nix> - <stockholm/makefu/2configs/git/cgit-retiolum.nix> - <stockholm/makefu/2configs/backup.nix> - # <stockholm/makefu/2configs/mattermost-docker.nix> - # <stockholm/makefu/2configs/disable_v6.nix> - <stockholm/makefu/2configs/exim-retiolum.nix> - <stockholm/makefu/2configs/tinc/retiolum.nix> - # Security <stockholm/makefu/2configs/sshd-totp.nix> @@ -26,83 +31,90 @@ in { <stockholm/makefu/2configs/tools/dev.nix> <stockholm/makefu/2configs/tools/sec.nix> <stockholm/makefu/2configs/zsh-user.nix> + <stockholm/makefu/2configs/mosh.nix> + # <stockholm/makefu/2configs/gui/xpra.nix> + + # networking + <stockholm/makefu/2configs/vpn/openvpn-server.nix> + # <stockholm/makefu/2configs/vpn/vpnws/server.nix> + #<stockholm/makefu/2configs/dnscrypt/server.nix> + <stockholm/makefu/2configs/iodined.nix> + # <stockholm/makefu/2configs/backup.nix> + <stockholm/makefu/2configs/tinc/retiolum.nix> + + # ci + # <stockholm/makefu/2configs/exim-retiolum.nix> + <stockholm/makefu/2configs/git/cgit-retiolum.nix> + <stockholm/makefu/2configs/shack/gitlab-runner> + <stockholm/makefu/2configs/remote-build/slave.nix> + <stockholm/makefu/2configs/taskd.nix> # services + <stockholm/makefu/2configs/sabnzbd.nix> + <stockholm/makefu/2configs/mail/mail.euer.nix> + + # sharing <stockholm/makefu/2configs/share/gum.nix> - # <stockholm/makefu/2configs/sabnzbd.nix> <stockholm/makefu/2configs/torrent.nix> - <stockholm/makefu/2configs/mosh.nix> - # <stockholm/makefu/2configs/retroshare.nix> + #<stockholm/makefu/2configs/retroshare.nix> + ## <stockholm/makefu/2configs/ipfs.nix> + #<stockholm/makefu/2configs/syncthing.nix> + { # ncdc + environment.systemPackages = [ pkgs.ncdc ]; + networking.firewall = { + allowedUDPPorts = [ 51411 ]; + allowedTCPPorts = [ 51411 ]; + }; + } + # <stockholm/makefu/2configs/opentracker.nix> - # network + ## network <stockholm/makefu/2configs/vpn/openvpn-server.nix> # <stockholm/makefu/2configs/vpn/vpnws/server.nix> <stockholm/makefu/2configs/dnscrypt/server.nix> + <stockholm/makefu/2configs/binary-cache/server.nix> + <stockholm/makefu/2configs/backup/server.nix> <stockholm/makefu/2configs/iodined.nix> + <stockholm/makefu/2configs/bitlbee.nix> + <stockholm/makefu/2configs/wireguard/server.nix> - # buildbot - <stockholm/makefu/2configs/remote-build/slave.nix> - - ## Web - <stockholm/makefu/2configs/nginx/share-download.nix> - <stockholm/makefu/2configs/nginx/euer.test.nix> + # Removed until move: no extra mails + <stockholm/makefu/2configs/urlwatch> + # Removed until move: avoid letsencrypt ban + ### Web + #<stockholm/makefu/2configs/nginx/share-download.nix> + #<stockholm/makefu/2configs/nginx/euer.test.nix> <stockholm/makefu/2configs/nginx/euer.mon.nix> <stockholm/makefu/2configs/nginx/euer.wiki.nix> <stockholm/makefu/2configs/nginx/euer.blog.nix> - # <stockholm/makefu/2configs/nginx/gum.krebsco.de.nix> - <stockholm/makefu/2configs/nginx/public_html.nix> - <stockholm/makefu/2configs/nginx/update.connector.one.nix> + ## <stockholm/makefu/2configs/nginx/gum.krebsco.de.nix> + #<stockholm/makefu/2configs/nginx/public_html.nix> + #<stockholm/makefu/2configs/nginx/update.connector.one.nix> <stockholm/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix> + <stockholm/makefu/2configs/nginx/gold.krebsco.de.nix> + <stockholm/makefu/2configs/nginx/iso.euer.nix> + <stockholm/makefu/2configs/shack/events-publisher> <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> - # <stockholm/makefu/2configs/deployment/graphs.nix> + <stockholm/makefu/2configs/deployment/graphs.nix> <stockholm/makefu/2configs/deployment/owncloud.nix> <stockholm/makefu/2configs/deployment/boot-euer.nix> <stockholm/makefu/2configs/deployment/bgt/hidden_service.nix> - { - services.taskserver.enable = true; - services.taskserver.fqdn = config.krebs.build.host.name; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.home.users = [ "makefu" ]; - networking.firewall.extraCommands = '' - iptables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT - ip6tables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT - ''; - } - # <stockholm/makefu/2configs/ipfs.nix> - <stockholm/makefu/2configs/syncthing.nix> - - # <stockholm/makefu/2configs/opentracker.nix> - <stockholm/makefu/2configs/dcpp/hub.nix> - <stockholm/makefu/2configs/dcpp/client.nix> - <stockholm/makefu/2configs/stats/client.nix> # <stockholm/makefu/2configs/logging/client.nix> - # Temporary: + # sharing + <stockholm/makefu/2configs/dcpp/airdcpp.nix> + <stockholm/makefu/2configs/dcpp/hub.nix> + + ## Temporary: # <stockholm/makefu/2configs/temp/rst-issue.nix> <stockholm/makefu/2configs/virtualisation/docker.nix> + <stockholm/makefu/2configs/virtualisation/libvirt.nix> - #{ - # services.dockerRegistry.enable = true; - # networking.firewall.allowedTCPPorts = [ 8443 ]; - - # services.nginx.virtualHosts."euer.krebsco.de" = { - # forceSSL = true; - # enableACME = true; - # extraConfig = '' - # client_max_body_size 1000M; - # ''; - # locations."/".proxyPass = "http://localhost:5000"; - # }; - #} - <stockholm/makefu/2configs/wireguard/server.nix> - { # iperf3 - networking.firewall.allowedUDPPorts = [ 5201 ]; - networking.firewall.allowedTCPPorts = [ 5201 ]; - } - + # krebs infrastructure services + <stockholm/makefu/2configs/stats/server.nix> ]; makefu.dl-dir = "/var/download"; @@ -120,9 +132,7 @@ in { ListenAddress = ${external-ip} 21031 ''; connectTo = [ - "muhbaasu" "tahoe" "flap" "wry" - "ni" - "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" + "prism" "ni" "enklave" "dishfire" "echelon" "hotdog" ]; }; @@ -137,10 +147,11 @@ in { environment.systemPackages = with pkgs;[ weechat bepasty-client-cli - get tmux ]; + # Hardware + # Network networking = { firewall = { @@ -179,4 +190,5 @@ in { }; users.users.makefu.extraGroups = [ "download" "nginx" ]; boot.tmpOnTmpfs = true; + state = [ "/home/makefu/.weechat" ]; } diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix index a40709169..bfe29b46c 100644 --- a/makefu/1systems/gum/hardware-config.nix +++ b/makefu/1systems/gum/hardware-config.nix @@ -1,26 +1,24 @@ { config, ... }: let - external-mac = "2a:c5:6e:d2:fc:7f"; - main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; - external-gw = "185.194.140.1"; + external-mac = "50:46:5d:9f:63:6b"; + main-disk = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA300_13H8863AS"; + sec-disk = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA300_23OJ2GJAS"; + external-gw = "144.76.26.225"; # single partition, label "nixos" # cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/809cf38 -L | tar zx ; mv * nixpkgs && touch .populate # static - external-ip = config.krebs.build.host.nets.internet.ip4.addr; - external-ip6 = config.krebs.build.host.nets.internet.ip6.addr; + external-ip = "144.76.26.247"; + external-ip6 = "2a01:4f8:191:12f6::2"; external-gw6 = "fe80::1"; - external-netmask = 22; + external-netmask = 27; external-netmask6 = 64; internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; ext-if = "et0"; # gets renamed on the fly in { imports = [ - <nixpkgs/nixos/modules/profiles/qemu-guest.nix> - <stockholm/makefu/2configs/fs/single-partition-ext4.nix> ]; - makefu.server.primary-itf = ext-if; services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="${ext-if}" @@ -40,7 +38,62 @@ in { defaultGateway = external-gw; }; boot.kernelParams = [ ]; - boot.loader.grub.device = main-disk; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.devices = [ main-disk ]; + boot.initrd.kernelModules = [ "dm-raid" ]; + boot.initrd.availableKernelModules = [ + "ata_piix" "vmw_pvscsi" "virtio_pci" "sd_mod" "ahci" + "xhci_pci" "ehci_pci" "ahci" "sd_mod" + ]; + boot.kernelModules = [ "kvm-intel" ]; + hardware.enableRedistributableFirmware = true; + fileSystems."/" = { + device = "/dev/mapper/nixos-root"; + fsType = "ext4"; + }; + fileSystems."/var/lib" = { + device = "/dev/mapper/nixos-lib"; + fsType = "ext4"; + }; + fileSystems."/var/download" = { + device = "/dev/mapper/nixos-download"; + fsType = "ext4"; + }; + fileSystems."/var/lib/borgbackup" = { + device = "/dev/mapper/nixos-backup"; + fsType = "ext4"; + }; + fileSystems."/boot" = { + device = "/dev/sda2"; + fsType = "vfat"; + }; + # parted -s -a optimal "$disk" \ + # mklabel gpt \ + # mkpart no-fs 0 1024KiB \ + # set 1 bios_grub on \ + # mkpart ESP fat32 1025KiB 1024MiB set 2 boot on \ + # mkpart primary 1025MiB 100% + # parted -s -a optimal "/dev/sdb" \ + # mklabel gpt \ + # mkpart primary 1M 100% + + #mkfs.vfat /dev/sda2 + #pvcreate /dev/sda3 + #pvcreate /dev/sdb1 + #vgcreate nixos /dev/sda3 /dev/sdb1 + #lvcreate -L 120G -m 1 -n root nixos + #lvcreate -L 50G -m 1 -n lib nixos + #lvcreate -L 100G -n download nixos + #lvcreate -L 100G -n backup nixos + #mkfs.ext4 /dev/mapper/nixos-root + #mkfs.ext4 /dev/mapper/nixos-lib + #mkfs.ext4 /dev/mapper/nixos-download + #mkfs.ext4 /dev/mapper/nixos-borgbackup + #mount /dev/mapper/nixos-root /mnt + #mkdir /mnt/boot + #mount /dev/sda2 /mnt/boot + #mkdir -p /mnt/var/src + #touch /mnt/var/src/.populate + } diff --git a/makefu/1systems/gum/rescue.txt b/makefu/1systems/gum/rescue.txt new file mode 100644 index 000000000..30276b7db --- /dev/null +++ b/makefu/1systems/gum/rescue.txt @@ -0,0 +1,11 @@ +mount /dev/mapper/nixos-root /mnt +mount /dev/sda2 /mnt/boot + +chroot-prepare /mnt +chroot /mnt /bin/sh + +journalctl -D /mnt/var/log/journal --since today # find the active system (or check grub) + +export PATH=/nix/store/9incs5sfn7n1vh1lavgp95v761nh11w3-nixos-system-nextgum-18.03pre-git/sw/bin +/nix/store/9incs5sfn7n1vh1lavgp95v761nh11w3-nixos-system-nextgum-18.03pre-git/activate +/nix/store/9incs5sfn7n1vh1lavgp95v761nh11w3-nixos-system-nextgum-18.03pre-git/sw/bin/nixos-rebuild diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix index 1e36c6e87..6940498f1 100644 --- a/makefu/1systems/gum/source.nix +++ b/makefu/1systems/gum/source.nix @@ -1,5 +1,5 @@ { - name="gum"; + name="nextgum"; torrent = true; clever_kexec = true; } diff --git a/makefu/1systems/nextgum/config.nix b/makefu/1systems/nextgum/config.nix deleted file mode 100644 index 64516fa98..000000000 --- a/makefu/1systems/nextgum/config.nix +++ /dev/null @@ -1,253 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import <stockholm/lib>; -let - external-ip = config.krebs.build.host.nets.internet.ip4.addr; - ext-if = config.makefu.server.primary-itf; -in { - imports = [ - <stockholm/makefu> - ./hardware-config.nix - ./transfer-config.nix - <stockholm/makefu/2configs/headless.nix> - # <stockholm/makefu/2configs/smart-monitor.nix> - - # Security - <stockholm/makefu/2configs/sshd-totp.nix> - - # Tools - <stockholm/makefu/2configs/tools/core.nix> - <stockholm/makefu/2configs/tools/dev.nix> - <stockholm/makefu/2configs/tools/sec.nix> - <stockholm/makefu/2configs/zsh-user.nix> - <stockholm/makefu/2configs/mosh.nix> - <stockholm/makefu/2configs/gui/xpra.nix> - - <stockholm/makefu/2configs/git/cgit-retiolum.nix> - <stockholm/makefu/2configs/backup.nix> - # <stockholm/makefu/2configs/exim-retiolum.nix> - <stockholm/makefu/2configs/tinc/retiolum.nix> - - # services - <stockholm/makefu/2configs/sabnzbd.nix> - <stockholm/makefu/2configs/mail/mail.euer.nix> - - # sharing - <stockholm/makefu/2configs/share/gum.nix> - <stockholm/makefu/2configs/torrent.nix> - #<stockholm/makefu/2configs/retroshare.nix> - ## <stockholm/makefu/2configs/ipfs.nix> - #<stockholm/makefu/2configs/syncthing.nix> - { # ncdc - environment.systemPackages = [ pkgs.ncdc ]; - networking.firewall = { - allowedUDPPorts = [ 51411 ]; - allowedTCPPorts = [ 51411 ]; - }; - } - # <stockholm/makefu/2configs/opentracker.nix> - - ## network - <stockholm/makefu/2configs/vpn/openvpn-server.nix> - # <stockholm/makefu/2configs/vpn/vpnws/server.nix> - <stockholm/makefu/2configs/dnscrypt/server.nix> - <stockholm/makefu/2configs/binary-cache/server.nix> - <stockholm/makefu/2configs/iodined.nix> - <stockholm/makefu/2configs/bitlbee.nix> - - ## buildbot - <stockholm/makefu/2configs/remote-build/slave.nix> - - # Removed until move: no extra mails - <stockholm/makefu/2configs/urlwatch> - # Removed until move: avoid double-update of domain - # < |