From f880fb21ca540506ba27e49c6ba92aa83923cd43 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Jun 2019 19:19:39 +0200 Subject: ma extra-gui: no more rambox --- krebs/1systems/puyak/config.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'krebs/1systems') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index af11c694..f9b83ef2 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -7,13 +7,13 @@ - + ]; krebs.build.host = config.krebs.hosts.puyak; @@ -59,10 +59,7 @@ }; }; - services.logind.extraConfig = '' - HandleLidSwitch=ignore - ''; - + services.logind.lidSwitch = "ignore"; services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="8c:70:5a:b2:84:58", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="et0" -- cgit v1.2.3 From 8225afec5b2e853d2e4eeae27adc5a39efcdae17 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 20 Jun 2019 22:21:56 +0200 Subject: wolf.r: init shack/prometheus config --- krebs/1systems/wolf/config.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 7ca0f0ec..d684dcd1 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -40,11 +40,16 @@ in ## Collect local statistics via collectd and send to collectd - ## write collectd statistics to wolf.shack - + { services.influxdb.enable = true; } + + + + # home-assistant + { services.influxdb.enable = true; } + ]; # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) -- cgit v1.2.3 From 053a74ebbf1448382262d2f51c5073472e616b12 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 7 Jul 2019 23:15:55 +0200 Subject: puyak.r: enable gitlab-runner --- krebs/1systems/puyak/config.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index f9b83ef2..ea73e4bd 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -14,6 +14,7 @@ + ]; krebs.build.host = config.krebs.hosts.puyak; @@ -60,6 +61,9 @@ }; services.logind.lidSwitch = "ignore"; + services.logind.lidSwitchExternalPower = "ignore"; + + services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="8c:70:5a:b2:84:58", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="et0" -- cgit v1.2.3 From e5d7d6eee253ab9a33a72ea0452f3b92083e759f Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Jul 2019 08:04:50 +0200 Subject: wolf.r: enable remote deployment --- krebs/1systems/wolf/config.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index d684dcd1..ed3a4c51 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -130,6 +130,7 @@ in config.krebs.users.raute.pubkey config.krebs.users.makefu-omo.pubkey "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDb9NPa2Hf51afcG1H13UPbE5E02J8aC9a1sGCRls592wAVlQbmojYR1jWDPA2m32Bsyv0ztqi81zDyndWWZPQVJVBk00VjYBcgk6D5ifqoAuWLzfuHJPWZGOvBf/U74/LNFNUkj1ywjneK7HYTRPXrRBBfBSQNmQzkvue7s599L2vdueZKyjNsMpx2m6nm2SchaMuDskSQut/168JgU1l4M8BeT68Bo4WdelhBYnhSI1a59FGkgdu2SCjyighLQRy2sOH3ksnkHWENPkA+wwQOlKl7R3DsEybrNd4NU9FSwFDyDmdhfv5gJp8UGSFdjAwx43+8zM5t5ruZ25J0LnVb0PuTuRA00UsW83MkLxFpDQLrQV08tlsY6iGrqxP67C3VJ6t4v6oTp7/vaRLhEFc1PhOLh+sZ18o8MLO+e2rGmHGHQnSKfBOLUvDMGa4jb01XBGjdnIXLOkVo79YR5jZn7jJb2gTZ95OD6bWSDADoURSuwuLa7kh4ti1ItAKuhkIvbuky3rRVvQEc92kJ6aNUswIUXJa0K2ibbIY6ycKAA3Ljksl3Mm9KzOn6yc/i/lSF+SOrTGhabPJigKkIoqKIwnV5IU3gkfsxPQJOBMPqHDGAOeYQe3WpWedEPYuhQEczw4exMb9TkNE96F71PzuQPJDl5sPAWyPLeMKpy5XbfRiF2by4nxN3ZIQvjtoyVkjNV+qM0q0yKBzLxuRAEQOZ2yCEaBudZQkQiwHD97H2vu4SRQ/2aOie1XiOnmdbQRDZSO3BsoDK569K1w+gDfSnqY7zVUMj6tw+uKx6Gstck5lbvYMtdWKsfPv/pDM8eyIVFLL93dKTX+ertcQj6xDwLfOiNubE5ayFXhYkjwImV6NgfBuq+3hLK0URP2rPlOZbbZTQ0WlKD6CCRZPMSZCU9oD2zYfqpvRArBUcdkAwGePezORkfJQLE6mYEJp6pdFkJ/IeFLbO6M0lZVlfnpzAC9kjjkMCRofZUETcFSppyTImCbgo3+ok59/PkNU5oavBXyW80ue2tWHr08HX/QALNte3UITmIIlU6SFMCPMWJqadK1eDPWfJ4H4iDXRNn3D5wqN++iMloKvpaj0wieqXLY4+YfvNTNr177OU48GEWW8DnoEkbpwsCbjPxznGDQhdDqdYyMY/fDgRQReKITvKYGHRzesGysw5cKsp9LEfXD0R6WE2TeiiENla5AWzTgXJB0AyZEcOiIfqOgT9Nr9S8q5gc/BdA7P+jhGGJgEHhV3dVlfIZ7pmZc27Yu7UTQ0lbAKWqcMSTOdne+QL6ILzbvLrQwdvax4tQdm5opfU16SrOox1AMwAbkdq84z6uJqYVx3cUXfMJgTyDNrVv3or root@plattenschwein" # for backup + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Lx5MKtVjB/Ef6LpEiIAgVwY5xKQFdHuLQR+odQO4cAgxj1QaIXGN0moixY52DebVQhAtiCNiFZ83uJyOj8kmu30yuXwtSOQeqziA859qMJKZ4ZcYdKvbXwnf2Chm5Ck/0FvtpjTWHIZAogwP1wQto/lcqHOjrTAnZeJfQuHTswYUSnmUU5zdsEZ9HidDPUc2Gv0wkBNd+KMQyOZl0HkaxHWvn0h4KK4hYZisOpeTfXJxD87bo+Eg4LL2vvnHW6dF6Ygrbd/0XRMsRRI8OAReVBUoJn7IE1wwAl/FpblNmhaF9hlL7g7hR1ADvaWMMw0e8SSzW6Y+oIa8qFQL6wR1 gitlab-builder" # for being deployed by gitlab ci ]; services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="${ext-if}" -- cgit v1.2.3 From bfff5c1a92af27cf01d52c24bb7e15f8f559b499 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 11 Jul 2019 09:37:46 +0200 Subject: wolf.r: enable muellshack --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index ed3a4c51..a1d2b826 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -23,6 +23,8 @@ in # # Say if muell will be collected + # provide muellshack api + # create samba share for anonymous usage with the laser and 3d printer pc -- cgit v1.2.3 From cf81f41a900edea9aab968c7c52e53ab04a311f3 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 11 Jul 2019 18:12:09 +0200 Subject: wolf.r: deploy node-light --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index a1d2b826..4c73198c 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -25,6 +25,8 @@ in # provide muellshack api + # provide light control api + # create samba share for anonymous usage with the laser and 3d printer pc -- cgit v1.2.3 From 13773d684c4c7c9802307e4968e21c70989769fe Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Jul 2019 17:22:03 +0200 Subject: wolf.r: configure muell_mail --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 4c73198c..5a9a481b 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -27,6 +27,8 @@ in # provide light control api + # send mail if muell was not handled + # create samba share for anonymous usage with the laser and 3d printer pc -- cgit v1.2.3 From 4325cce945781c93c04faf71705b0f19f723542a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 16 Jul 2019 09:04:18 +0200 Subject: wolf.r: enable s3-power --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 5a9a481b..9a7371c1 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -29,6 +29,8 @@ in # send mail if muell was not handled + # send mail if muell was not handled + # create samba share for anonymous usage with the laser and 3d printer pc -- cgit v1.2.3 From 31944ce77dfd63f0778952b6ae5a29f7ae8a0cab Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 16 Jul 2019 19:48:47 +0200 Subject: wolf.r: also use openhab ip address --- krebs/1systems/wolf/config.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 9a7371c1..d2f0eaeb 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: let shack-ip = config.krebs.build.host.nets.shack.ip4.addr; + openhab-ip = "10.42.2.139"; # powerraw contains the hardcoded ip of openhab.shack influx-host = "127.0.0.1"; ext-if = "et0"; external-mac = "52:54:b0:0b:af:fe"; @@ -89,10 +90,16 @@ in networking = { firewall.enable = false; firewall.allowedTCPPorts = [ 8088 8086 8083 ]; - interfaces."${ext-if}".ipv4.addresses = [{ - address = shack-ip; - prefixLength = 20; - }]; + interfaces."${ext-if}".ipv4.addresses = [ + { + address = shack-ip; + prefixLength = 20; + } + { + address = openhab-ip; + prefixLength = 20; + } + ]; defaultGateway = "10.42.0.1"; nameservers = [ "10.42.0.100" "10.42.0.200" ]; -- cgit v1.2.3 From da4ecbeccd174e1d519bafb15ad0935aa2cec1b2 Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 17 Jul 2019 00:46:15 +0200 Subject: wolf.r: remove openhab-ip --- krebs/1systems/wolf/config.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index d2f0eaeb..0b6824e2 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: let shack-ip = config.krebs.build.host.nets.shack.ip4.addr; - openhab-ip = "10.42.2.139"; # powerraw contains the hardcoded ip of openhab.shack influx-host = "127.0.0.1"; ext-if = "et0"; external-mac = "52:54:b0:0b:af:fe"; @@ -95,10 +94,6 @@ in address = shack-ip; prefixLength = 20; } - { - address = openhab-ip; - prefixLength = 20; - } ]; defaultGateway = "10.42.0.1"; -- cgit v1.2.3 From c38f02c4d7a09cd8a1fd50b68f08338ae54a82bb Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Jul 2019 00:53:56 +0200 Subject: shack/s3-power: update revision --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index d2f0eaeb..270a0056 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -47,6 +47,8 @@ in ## Collect radioactive data and put into graphite + ## mqtt.shack + ## Collect local statistics via collectd and send to collectd -- cgit v1.2.3 From 73a5143866b2853f11a251c828681f92fd3aa703 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Jul 2019 10:43:27 +0200 Subject: wolf.r: enable powerraw --- krebs/1systems/wolf/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/1systems') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 270a0056..c16b55c2 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -32,6 +32,8 @@ in # send mail if muell was not handled + # powerraw usb serial to mqtt and raw socket + # create samba share for anonymous usage with the laser and 3d printer pc -- cgit v1.2.3