Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m gum: move to netcup

Browse Source
This commit is contained in:
makefu 2017-05-02 14:03:25 +02:00
parent f1b266e05c
commit 5cfbfd46bf
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/3modules/makefu/default.nix
View File

@ -427,7 +427,7 @@ with import <stockholm/lib>;
}; };
gum = rec { gum = rec {
cores = 1; cores = 2;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
@ -448,7 +448,7 @@ with import <stockholm/lib>;
}; };
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "195.154.108.70"; ip4.addr = "188.68.40.19";
aliases = [ aliases = [
"gum.i" "gum.i"
]; ];
@ -456,7 +456,7 @@ with import <stockholm/lib>;
retiolum = { retiolum = {
via = internet; via = internet;
ip4.addr = "10.243.0.211"; 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 = [ aliases = [
"gum.r" "gum.r"
"cgit.gum.r" "cgit.gum.r"

26
makefu/1systems/gum.nix
View File

@ -2,23 +2,32 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let
external-mac = "3a:66:48:8e:82:b2";
external-ip = config.krebs.build.host.nets.internet.ip4.addr; 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; 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 { in {
imports = [ imports = [
../. ../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/headless.nix ../2configs/headless.nix
../2configs/fs/simple-swap.nix
../2configs/fs/single-partition-ext4.nix ../2configs/fs/single-partition-ext4.nix
../2configs/smart-monitor.nix ../2configs/smart-monitor.nix
../2configs/git/cgit-retiolum.nix ../2configs/git/cgit-retiolum.nix
../2configs/backup.nix ../2configs/backup.nix
# ../2configs/mattermost-docker.nix # ../2configs/mattermost-docker.nix
../2configs/disable_v6.nix # ../2configs/disable_v6.nix
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/tinc/retiolum.nix ../2configs/tinc/retiolum.nix
../2configs/urlwatch.nix ../2configs/urlwatch.nix
# Tools
../2configs/tools/core.nix
../2configs/tools/dev.nix
../2configs/tools/sec.nix
# services # services
../2configs/gum-share.nix ../2configs/gum-share.nix
../2configs/sabnzbd.nix ../2configs/sabnzbd.nix
@ -46,7 +55,7 @@ in {
# ../2configs/logging/central-logging-client.nix # ../2configs/logging/central-logging-client.nix
]; ];
services.smartd.devices = [ { device = "/dev/sda";} ]; services.smartd.devices = [ { device = main-disk;} ];
makefu.dl-dir = "/var/download"; makefu.dl-dir = "/var/download";
@ -83,16 +92,15 @@ in {
get get
]; ];
services.bitlbee.enable = true; services.bitlbee.enable = true;
systemd.services.bitlbee.environment.BITLBEE_DEBUG="1";
# Hardware # Hardware
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = main-disk;
boot.initrd.availableKernelModules = [ "pata_via" "uhci_hcd" ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
# Network # Network
services.udev.extraRules = '' 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 = [ ]; boot.kernelParams = [ ];
networking = { networking = {
@ -124,9 +132,9 @@ in {
}; };
interfaces.et0.ip4 = [{ interfaces.et0.ip4 = [{
address = external-ip; address = external-ip;
prefixLength = 24; prefixLength = external-netmask;
}]; }];
defaultGateway = "195.154.108.1"; defaultGateway = external-gw;
nameservers = [ "8.8.8.8" ]; nameservers = [ "8.8.8.8" ];
}; };