From 533c3c07b7a4750e97eb1c474e01e651ddb83aa5 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 6 Mar 2016 20:56:25 +0100 Subject: add darth --- makefu/1systems/darth.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 makefu/1systems/darth.nix (limited to 'makefu') diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix new file mode 100644 index 000000000..322960354 --- /dev/null +++ b/makefu/1systems/darth.nix @@ -0,0 +1,15 @@ +{ config, pkgs, ... }: +{ + 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"; +} -- cgit v1.2.3 From 3eaf13357178f45759346aa900fe78cee837d339 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 6 Mar 2016 20:57:08 +0100 Subject: ma 1 filepimp: remove disk2 --- makefu/1systems/filepimp.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix index f2c592ea9..2a78b45a4 100644 --- a/makefu/1systems/filepimp.nix +++ b/makefu/1systems/filepimp.nix @@ -3,11 +3,19 @@ let byid = dev: "/dev/disk/by-id/" + dev; part1 = disk: disk + "-part1"; rootDisk = byid "ata-SanDisk_SDSSDP064G_140237402890"; - jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; + # N54L Chassis: + # ____________________ + # |______FRONT_______| + # | [ ]| + # | [ d1 ** d3 d4 ]| + # |___[_____________]| jDisk1 = byid "ata-ST4000DM000-1F2168_Z3040NEA"; + + # transfer to omo + # jDisk0 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; jDisk2 = byid "ata-WDC_WD40EFRX-68WT0N0_WD-WCC4E0621363"; jDisk3 = byid "ata-TOSHIBA_MD04ACA400_156GK89OFSBA"; - allDisks = [ rootDisk jDisk0 jDisk1 jDisk2 jDisk3 ]; + allDisks = [ rootDisk jDisk1 jDisk2 jDisk3 ]; in { imports = [ # Include the results of the hardware scan. @@ -44,7 +52,11 @@ in { in { enable = true; # todo combine creation when enabling the mount point - disks = map toMedia [ "j0" "j1" "j2" ]; + disks = map toMedia [ + # "j0" + "j1" + "j2" + ]; parity = toMedia "par0"; }; # TODO: refactor, copy-paste from omo @@ -58,8 +70,9 @@ in { xfsmount = name: dev: { "/media/${name}" = { device = dev; fsType = "xfs"; }; }; in - (xfsmount "j0" (part1 jDisk0)) - // (xfsmount "j1" (part1 jDisk1)) - // (xfsmount "j2" (part1 jDisk2)) - // (xfsmount "par0" (part1 jDisk3)); + # (xfsmount "j0" (part1 jDisk0)) // + (xfsmount "j1" (part1 jDisk1)) // + (xfsmount "j2" (part1 jDisk2)) // + (xfsmount "par0" (part1 jDisk3)) + ; } -- cgit v1.2.3 From f5e1235d01e989437bb1352c403a5c9d4afcb3d3 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Mar 2016 02:10:34 +0100 Subject: ma 2 tinc-basic-retiolum: RIP --- makefu/1systems/darth.nix | 22 +++++++++++----------- makefu/1systems/filepimp.nix | 2 +- makefu/1systems/gum.nix | 20 ++++++++++++++------ makefu/1systems/omo.nix | 2 +- makefu/1systems/pnp.nix | 2 +- makefu/1systems/pornocauster.nix | 3 ++- makefu/1systems/tsp.nix | 2 +- makefu/1systems/wry.nix | 2 +- makefu/2configs/tinc-basic-retiolum.nix | 14 -------------- 9 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 makefu/2configs/tinc-basic-retiolum.nix (limited to 'makefu') 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 @@ ]; + 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" - ]; - }; -} -- cgit v1.2.3 From ce98c6d7a3980e1e81e4ecceaec12d29cd25eb36 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Mar 2016 02:23:04 +0100 Subject: s 1 wolf: use tinc_pre for local discovery --- makefu/1systems/darth.nix | 1 + makefu/1systems/pornocauster.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'makefu') diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix index 7dffb71d9..7972c6201 100644 --- a/makefu/1systems/darth.nix +++ b/makefu/1systems/darth.nix @@ -10,6 +10,7 @@ with config.krebs.lib; krebs.build.host = config.krebs.hosts.darth; krebs.retiolum.enable = true; + nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039"; } diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 8f09f948d..c27bd5dfc 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -49,6 +49,7 @@ networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 25 + 80 ]; krebs.build.host = config.krebs.hosts.pornocauster; -- cgit v1.2.3 From 4588c5a19bd61bc8bac1f9ad12016a9d9b56dfdc Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Mar 2016 09:03:49 +0100 Subject: ma 1 darth: add omo ssh pubkey --- makefu/1systems/darth.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'makefu') diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix index 7972c6201..95a37006b 100644 --- a/makefu/1systems/darth.nix +++ b/makefu/1systems/darth.nix @@ -13,4 +13,7 @@ with config.krebs.lib; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039"; + users.users.root.openssh.authorizedKeys.keys = [ + config.krebs.users.makefu-omo.pubkey + ]; } -- cgit v1.2.3 From 2e317bfe747ec968d3b933ae4c0df68ad204021c Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 15 Mar 2016 13:20:14 +0100 Subject: ma 2: use tinc-pre per default --- makefu/1systems/darth.nix | 2 -- makefu/1systems/gum.nix | 1 - makefu/1systems/omo.nix | 1 - makefu/1systems/pnp.nix | 4 +--- makefu/1systems/pornocauster.nix | 3 --- makefu/1systems/repunit.nix | 6 +++--- makefu/1systems/vbob.nix | 3 --- makefu/1systems/wry.nix | 1 - 8 files changed, 4 insertions(+), 17 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix index 95a37006b..a33744f0b 100644 --- a/makefu/1systems/darth.nix +++ b/makefu/1systems/darth.nix @@ -8,9 +8,7 @@ with config.krebs.lib; ../. ]; - krebs.build.host = config.krebs.hosts.darth; krebs.retiolum.enable = true; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039"; users.users.root.openssh.authorizedKeys.keys = [ diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 3976a1eb0..e784fdc12 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -24,7 +24,6 @@ in { ]; services.smartd.devices = [ { device = "/dev/sda";} ]; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; ###### stable krebs.build.host = config.krebs.hosts.gum; diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index eed6d2316..bfcd2298a 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -122,7 +122,6 @@ in { hardware.cpu.amd.updateMicrocode = true; zramSwap.enable = true; - zramSwap.numDevices = 2; krebs.build.host = config.krebs.hosts.omo; } diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index ca7caa35f..4b8d39c89 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -43,10 +43,8 @@ krebs.build.host = config.krebs.hosts.pnp; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - networking.firewall.allowedTCPPorts = [ - 25 + 25 ]; } diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index c27bd5dfc..119f0e5e4 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -38,9 +38,6 @@ ]; krebs.retiolum.enable = true; - nixpkgs.config.packageOverrides = pkgs: { - tinc = pkgs.tinc_pre; - }; # steam hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index f9421cfa2..bf6ff9fb6 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -41,7 +41,7 @@ }; # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; [ - jq - ]; + environment.systemPackages = with pkgs; [ + jq + ]; } diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index e07525d0d..748b08ef1 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -14,9 +14,6 @@ ]; nixpkgs.config.allowUnfree = true; - nixpkgs.config.packageOverrides = pkgs: { - tinc = pkgs.tinc_pre; - }; krebs.build.source.upstream-nixpkgs = { url = https://github.com/makefu/nixpkgs; diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index c49b48ea1..edaf1b803 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -52,7 +52,6 @@ in { krebs.nginx.enable = true; krebs.retiolum-bootstrap.enable = true; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; krebs.tinc_graphs = { enable = true; nginx = { -- cgit v1.2.3