Merge remote-tracking branch 'gum/master'

3 files changed, 10 insertions, 10 deletions

diff --git a/krebs/1systems/filebitch/config.nix b/krebs/1systems/filebitch/config.nix
index e27d036c8..a71e14f3e 100644
--- a/krebs/1systems/filebitch/config.nix
+++ b/krebs/1systems/filebitch/config.nix
@@ -35,12 +35,13 @@ in
   '';
   networking = {
     firewall.enable = true;
-    interfaces.et0.ipv4.addresses = [
-      {
-        address = shack-ip;
-        prefixLength = 20;
-      }
-    ];
+    interfaces.et0.useDHCP = true;
+    #interfaces.et0.ipv4.addresses = [
+    #  {
+    #    address = shack-ip;
+    #    prefixLength = 20;
+    #  }
+    #];
 
     defaultGateway = "10.42.0.1";
     nameservers = [ "10.42.0.100" "10.42.0.200" ];
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 033cb94d1..931ebe70b 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -46,10 +46,8 @@
     # light.shack web-ui
     <stockholm/krebs/2configs/shack/light.shack.nix> #light.shack
 
-    # powerraw usb serial to mqtt and raw socket
-    <stockholm/krebs/2configs/shack/powerraw.nix> # powerraw.shack standby.shack
-    # send power stats to s3
-    <stockholm/krebs/2configs/shack/s3-power.nix> # powerraw.shack must be available
+    # fetch the u300 power stats
+    <stockholm/krebs/2configs/shack/power/u300-power.nix>
 
 
     { # do not log to /var/spool/log
diff --git a/krebs/1systems/puyak/net.nix b/krebs/1systems/puyak/net.nix
index a46a24952..59b22b380 100644
--- a/krebs/1systems/puyak/net.nix
+++ b/krebs/1systems/puyak/net.nix
@@ -7,6 +7,7 @@ in {
     SUBSYSTEM=="net", ATTR{address}=="8c:70:5a:b2:84:58", NAME="wl0"
     SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="${ext-if}"
   '';
+  networking.wireless.enable = true;
   networking = {
     firewall.enable = true;
     firewall.allowedTCPPorts = [ 80 443 8088 8086 8083 5901 ];