diff options
| -rw-r--r-- | makefu/1systems/darth.nix | 22 | ||||
| -rw-r--r-- | makefu/1systems/filepimp.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/gum.nix | 20 | ||||
| -rw-r--r-- | makefu/1systems/omo.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/pnp.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/tsp.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/tinc-basic-retiolum.nix | 14 |
9 files changed, 32 insertions, 37 deletions
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix index 322960354..7dffb71d9 100644 --- a/makefu/1systems/darth.nix +++ b/makefu/1systems/darth.nix @@ -1,15 +1,15 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: + +with config.krebs.lib; { - imports = - [ + imports = [ ../2configs/fs/single-partition-ext4.nix ../2configs/zsh-user.nix - ]; - krebs = { - enable = true; - retiolum.enable = true; - build.host = config.krebs.hosts.darth; - }; - # You want to change these :) - boot.loader.grub.device = "/dev/sda"; + ../. + ]; + + krebs.build.host = config.krebs.hosts.darth; + krebs.retiolum.enable = true; + + boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039"; } diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix index 2a78b45a4..593f77378 100644 --- a/makefu/1systems/filepimp.nix +++ b/makefu/1systems/filepimp.nix @@ -21,9 +21,9 @@ in { [ # Include the results of the hardware scan. ../. ../2configs/fs/single-partition-ext4.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/smart-monitor.nix ]; + krebs.retiolum.enable = true; krebs.build.host = config.krebs.hosts.filepimp; # AMD N54L boot = { diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 906c72de4..3976a1eb0 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -7,7 +7,6 @@ let in { imports = [ ../. - ../2configs/tinc-basic-retiolum.nix ../2configs/headless.nix ../2configs/fs/simple-swap.nix ../2configs/fs/single-partition-ext4.nix @@ -29,11 +28,20 @@ in { ###### stable krebs.build.host = config.krebs.hosts.gum; - krebs.retiolum.extraConfig = '' - ListenAddress = ${external-ip} 53 - ListenAddress = ${external-ip} 655 - ListenAddress = ${external-ip} 21031 - ''; + krebs.retiolum = { + enable = true; + extraConfig = '' + ListenAddress = ${external-ip} 53 + ListenAddress = ${external-ip} 655 + ListenAddress = ${external-ip} 21031 + ''; + connectTo = [ + "muhbaasu" "tahoe" "flap" "wry" + "ire" "cd" "mkdir" "rmdir" + "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" + ]; + }; + krebs.nginx.servers.cgit.server-names = [ "cgit.euer.krebsco.de" ]; diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index aa4a8a5c9..eed6d2316 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -37,7 +37,6 @@ in { ../. # TODO: unlock home partition via ssh ../2configs/fs/single-partition-ext4.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/zsh-user.nix ../2configs/exim-retiolum.nix ../2configs/smart-monitor.nix @@ -45,6 +44,7 @@ in { ../2configs/share-user-sftp.nix ../2configs/omo-share.nix ]; + krebs.retiolum.enable = true; networking.firewall.trustedInterfaces = [ "enp3s0" ]; # udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net # tcp:80 - nginx for sharing files diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 8791ad1d7..ca7caa35f 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -7,7 +7,6 @@ imports = [ ../. - ../2configs/tinc-basic-retiolum.nix ../2configs/headless.nix ../../krebs/3modules/Reaktor.nix @@ -20,6 +19,7 @@ <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix> ]; + krebs.retiolum.enable = true; virtualisation.graphics = false; # also export secrets, see Usage above fileSystems = pkgs.lib.mkVMOverride { diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 9415f2345..8f09f948d 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -11,7 +11,6 @@ ../2configs/laptop-utils.nix # Krebs - ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix @@ -35,8 +34,10 @@ ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix #../2configs/wordpress.nix + ../2configs/nginx/public_html.nix ]; + krebs.retiolum.enable = true; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index d5d44cce0..302ba6f99 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -8,7 +8,6 @@ [ # Include the results of the hardware scan. ../. ../2configs/base-gui.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/fs/sda-crypto-root.nix # hardware specifics are in here ../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix @@ -20,6 +19,7 @@ ../2configs/exim-retiolum.nix ]; # not working in vm + krebs.retiolum.enable = true; krebs.build.host = config.krebs.hosts.tsp; networking.firewall.allowedTCPPorts = [ diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 462ec4faf..c49b48ea1 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -12,7 +12,6 @@ in { ../../tv/2configs/hw/CAC.nix ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/headless.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/bepasty-dual.nix @@ -27,6 +26,7 @@ in { # collectd ../2configs/collectd/collectd-base.nix ]; + krebs.retiolum.enable = true; services.nixosManual.enable = false; programs.man.enable = false; krebs.build.host = config.krebs.hosts.wry; diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix deleted file mode 100644 index 12d3b8b7c..000000000 --- a/makefu/2configs/tinc-basic-retiolum.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -with config.krebs.lib; -{ - krebs.retiolum = { - enable = true; - connectTo = [ - "gum" - "pigstarter" - "fastpoke" - "ire" - ]; - }; -} |