diff options
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 6 | ||||
| -rw-r--r-- | makefu/1systems/gum.nix | 26 |
2 files changed, 20 insertions, 12 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 651b9a3c..65034498 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -427,7 +427,7 @@ with import <stockholm/lib>; }; gum = rec { - cores = 1; + cores = 2; extraZones = { "krebsco.de" = '' @@ -448,7 +448,7 @@ with import <stockholm/lib>; }; nets = rec { internet = { - ip4.addr = "195.154.108.70"; + ip4.addr = "188.68.40.19"; aliases = [ "gum.i" ]; @@ -456,7 +456,7 @@ with import <stockholm/lib>; retiolum = { via = internet; ip4.addr = "10.243.0.211"; - # ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; + ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; aliases = [ "gum.r" "cgit.gum.r" diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 95d09282..93ca8f64 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -2,23 +2,32 @@ with import <stockholm/lib>; let + external-mac = "3a:66:48:8e:82:b2"; external-ip = config.krebs.build.host.nets.internet.ip4.addr; + external-gw = "188.68.40.1"; + external-netmask = 22; internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; + main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; in { imports = [ ../. + <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ../2configs/headless.nix - ../2configs/fs/simple-swap.nix ../2configs/fs/single-partition-ext4.nix ../2configs/smart-monitor.nix ../2configs/git/cgit-retiolum.nix ../2configs/backup.nix # ../2configs/mattermost-docker.nix - ../2configs/disable_v6.nix + # ../2configs/disable_v6.nix ../2configs/exim-retiolum.nix ../2configs/tinc/retiolum.nix ../2configs/urlwatch.nix + # Tools + ../2configs/tools/core.nix + ../2configs/tools/dev.nix + ../2configs/tools/sec.nix + # services ../2configs/gum-share.nix ../2configs/sabnzbd.nix @@ -46,7 +55,7 @@ in { # ../2configs/logging/central-logging-client.nix ]; - services.smartd.devices = [ { device = "/dev/sda";} ]; + services.smartd.devices = [ { device = main-disk;} ]; makefu.dl-dir = "/var/download"; @@ -83,16 +92,15 @@ in { get ]; services.bitlbee.enable = true; - systemd.services.bitlbee.environment.BITLBEE_DEBUG="1"; # Hardware - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = [ "pata_via" "uhci_hcd" ]; + boot.loader.grub.device = main-disk; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; boot.kernelModules = [ "kvm-intel" ]; # Network services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="c8:0a:a9:c8:ee:dd", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="et0" ''; boot.kernelParams = [ ]; networking = { @@ -124,9 +132,9 @@ in { }; interfaces.et0.ip4 = [{ address = external-ip; - prefixLength = 24; + prefixLength = external-netmask; }]; - defaultGateway = "195.154.108.1"; + defaultGateway = external-gw; nameservers = [ "8.8.8.8" ]; }; |