From d31fbfe31ee26b70f13c93d910f5ce0d3ce1d8c2 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 5 Feb 2020 17:34:44 +0100 Subject: ma 2/homeautomation -> 2/ham avoid overlapping autocomplete with home-manager --- makefu/1systems/omo/config.nix | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 9b9b91a6..d00d61fd 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -57,7 +57,7 @@ in { # - + # # services { @@ -71,14 +71,9 @@ in { - { - # Risikoübernahme - nixpkgs.config.permittedInsecurePackages = [ - "homeassistant-0.77.2" - ]; - } - - + + + { makefu.ps3netsrv = { enable = true; @@ -120,7 +115,7 @@ in { gid = (import ).genid "share"; members = [ "makefu" "misa" ]; }; - networking.firewall.trustedInterfaces = [ primaryInterface ]; + networking.firewall.trustedInterfaces = [ primaryInterface "docker0" ]; @@ -141,18 +136,18 @@ in { sed-plugin random-emoji ]; }; - krebs.Reaktor.reaktor-bgt = { - nickname = "Reaktor|bgt"; - workdir = "/var/lib/Reaktor/bgt"; - channels = [ "#binaergewitter" ]; - plugins = with pkgs.ReaktorPlugins; - [ titlebot - # stockholm-issue - nixos-version - shack-correct - sed-plugin - random-emoji ]; - }; + #krebs.Reaktor.reaktor-bgt = { + # nickname = "Reaktor|bgt"; + # workdir = "/var/lib/Reaktor/bgt"; + # channels = [ "#binaergewitter" ]; + # plugins = with pkgs.ReaktorPlugins; + # [ titlebot + # # stockholm-issue + # nixos-version + # shack-correct + # sed-plugin + # random-emoji ]; + #}; krebs.build.host = config.krebs.hosts.omo; } -- cgit v1.2.3 From 88ecd06d65e7c18136f78c08291f6b2a6a770664 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:46:41 +0100 Subject: ma omo.r: deploy ham service --- makefu/1systems/omo/config.nix | 1 - makefu/1systems/omo/hw/omo.nix | 11 +++++++---- makefu/1systems/omo/source.nix | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index d00d61fd..37fb9128 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -85,7 +85,6 @@ in { makefu.mpd.musicDirectory = "/media/cryptX/music"; } - # security # diff --git a/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix index 31db335b..87af2a31 100644 --- a/makefu/1systems/omo/hw/omo.nix +++ b/makefu/1systems/omo/hw/omo.nix @@ -26,9 +26,10 @@ let # |_______| # cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6"; cryptDisk0 = byid "ata-ST8000DM004-2CX188_ZCT01PLV"; - cryptDisk1 = byid "ata-TP02000GB_TPW151006050068"; - cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; + cryptDisk1 = byid "ata-WDC_WD80EZAZ-11TDBA0_7SJPVLYW"; cryptDisk3 = byid "ata-ST8000DM004-2CX188_ZCT01SG4"; + cryptDisk2 = byid "ata-WDC_WD80EZAZ-11TDBA0_7SJPWT5W"; + # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; # all physical disks @@ -48,8 +49,8 @@ in { makefu.snapraid = { enable = true; - disks = map toMapper [ 0 2 3 ]; - parity = toMapper 1; + disks = map toMapper [ 0 1 3 ]; + parity = toMapper 2; # find -name PARITY_PARTITION }; fileSystems = let cryptMount = name: @@ -102,6 +103,8 @@ in { "firewire_ohci" "usb_storage" "usbhid" + "raid456" + "megaraid_sas" ]; kernelModules = [ "kvm-intel" ]; diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix index 0d42cc9e..05c17377 100644 --- a/makefu/1systems/omo/source.nix +++ b/makefu/1systems/omo/source.nix @@ -1,4 +1,5 @@ { name="omo"; torrent = true; + unstable = true; } -- cgit v1.2.3 From 1236ebdb6ce7371868cd5d13d76be58b3124d543 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:47:21 +0100 Subject: ma gum.r: disable unused services --- makefu/1systems/gum/config.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 3b084d35..d756a0d6 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -21,11 +21,12 @@ in { ]; }; } + # - + # @@ -89,8 +90,8 @@ in { # services # - - { krebs.exim.enable = mkForce false; } + # + { krebs.exim.enable = mkDefault true; } # sharing @@ -119,7 +120,7 @@ in { # Removed until move: avoid letsencrypt ban ### Web - # + # @@ -131,10 +132,14 @@ in { # # - + # + + + + -- cgit v1.2.3 From 51aeea88919487f5379f41007bd0416db4ea5965 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:48:14 +0100 Subject: ma x.r: disable gum-client --- makefu/1systems/x/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index ea18c68a..4c479875 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -58,7 +58,7 @@ # Krebs - + # # @@ -103,6 +103,7 @@ # # + @@ -142,7 +143,6 @@ ]; }; } - ]; makefu.server.primary-itf = "wlp3s0"; -- cgit v1.2.3 From b1c4cd5b1c659853a6b1057786c5e333e5b98604 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 12:49:54 +0100 Subject: ma gum.r: fix cgit.euer.krebsco.de --- makefu/1systems/gum/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index d756a0d6..8603d769 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -176,7 +176,8 @@ in { services.nginx.virtualHosts."cgit.euer.krebsco.de" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://cgit.gum.r"; + locations."/".proxyPass = "http://localhost/"; + locations."/".extraConfig = ''proxy_set_header Host cgit;''; }; krebs.build.host = config.krebs.hosts.gum; -- cgit v1.2.3