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

Merge branch 'master' of pnp:stockholm

Browse Source
This commit is contained in:
makefu 2015-11-10 19:01:43 +01:00
commit 5ac356be52
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/4lib/infest/prepare.sh
View File

@ -66,6 +66,7 @@ prepare_debian() {
type bzip2 2>/dev/null || apt-get install bzip2 type bzip2 2>/dev/null || apt-get install bzip2
type git 2>/dev/null || apt-get install git type git 2>/dev/null || apt-get install git
type rsync 2>/dev/null || apt-get install rsync type rsync 2>/dev/null || apt-get install rsync
type curl 2>/dev/null || apt-get install curl
prepare_common prepare_common
} }

1
krebs/default.nix
View File

@ -11,6 +11,7 @@ let out = {
inherit infest; inherit infest;
inherit init; inherit init;
inherit nixos-install; inherit nixos-install;
inherit populate;
}; };
deploy = deploy =

36
makefu/1systems/gum.nix
View File

@ -9,24 +9,41 @@ in {
# TODO: copy this config or move to krebs # TODO: copy this config or move to krebs
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix ../2configs/headless.nix
../2configs/fs/single-partition-ext4.nix
# ../2configs/iodined.nix # ../2configs/iodined.nix
# Reaktor
../2configs/Reaktor/simpleExtend.nix
]; ];
krebs.build.target = "root@gum.krebsco.de";
krebs.build.host = config.krebs.hosts.gum; krebs.build.host = config.krebs.hosts.gum;
krebs.Reaktor.enable = true; # Hardware
boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "pata_via" "uhci_hcd" ];
boot.kernelModules = [ "kvm-intel" ];
# prepare graphs # Network
krebs.nginx.enable = true;
services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="c8:0a:a9:c8:ee:dd", NAME="et0"
'';
networking = { networking = {
firewall.allowPing = true; firewall = {
firewall.allowedTCPPorts = [ 80 443 655 ]; allowPing = true;
firewall.allowedUDPPorts = [ 655 ]; allowedTCPPorts = [
interfaces.enp2s1.ip4 = [{ # smtp
25
# http
80 443
# tinc
655
];
allowedUDPPorts = [
# tinc
655 53
];
};
interfaces.et0.ip4 = [{
address = external-ip; address = external-ip;
prefixLength = 24; prefixLength = 24;
}]; }];
@ -34,5 +51,4 @@ in {
nameservers = [ "8.8.8.8" ]; nameservers = [ "8.8.8.8" ];
}; };
# based on ../../tv/2configs/CAC-Developer-2.nix
} }