diff options
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/hotdog/config.nix | 1 | ||||
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 9 | ||||
| -rw-r--r-- | krebs/1systems/wolf/config.nix | 34 | 
3 files changed, 32 insertions, 12 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 32e416831..60ec625f2 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -14,7 +14,6 @@      <stockholm/krebs/2configs/ircd.nix>      <stockholm/krebs/2configs/nscd-fix.nix>      <stockholm/krebs/2configs/reaktor2.nix> -    <stockholm/krebs/2configs/repo-sync.nix>    ];    krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index af11c6944..ea73e4bd2 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -7,13 +7,14 @@      <stockholm/krebs/2configs/secret-passwords.nix>      <stockholm/krebs/2configs/hw/x220.nix> -    <stockholm/krebs/2configs/stats/puyak-client.nix>      <stockholm/krebs/2configs/binary-cache/nixos.nix>      <stockholm/krebs/2configs/binary-cache/prism.nix>      <stockholm/krebs/2configs/go.nix>      <stockholm/krebs/2configs/ircd.nix>      <stockholm/krebs/2configs/news.nix>      <stockholm/krebs/2configs/news-spam.nix> +    <stockholm/krebs/2configs/shack/prometheus/node.nix> +    <stockholm/krebs/2configs/shack/gitlab-runner.nix>    ];    krebs.build.host = config.krebs.hosts.puyak; @@ -59,9 +60,9 @@      };    }; -  services.logind.extraConfig = '' -    HandleLidSwitch=ignore -  ''; +  services.logind.lidSwitch = "ignore"; +  services.logind.lidSwitchExternalPower = "ignore"; +    services.udev.extraRules = ''      SUBSYSTEM=="net", ATTR{address}=="8c:70:5a:b2:84:58", NAME="wl0" diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 7ca0f0ec1..9ae65466c 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -23,6 +23,16 @@ in      # <stockholm/krebs/2configs/shack/nix-cacher.nix>      # Say if muell will be collected      <stockholm/krebs/2configs/shack/muell_caller.nix> +    # provide muellshack api +    <stockholm/krebs/2configs/shack/muellshack.nix> +    # provide light control api +    <stockholm/krebs/2configs/shack/node-light.nix> +    # send mail if muell was not handled +    <stockholm/krebs/2configs/shack/muell_mail.nix> +    # send mail if muell was not handled +    <stockholm/krebs/2configs/shack/s3-power.nix> +    # powerraw usb serial to mqtt and raw socket +    <stockholm/krebs/2configs/shack/powerraw.nix>      # create samba share for anonymous usage with the laser and 3d printer pc      <stockholm/krebs/2configs/shack/share.nix> @@ -38,13 +48,20 @@ in      <stockholm/krebs/2configs/shack/mqtt_sub.nix>      ## Collect radioactive data and put into graphite      <stockholm/krebs/2configs/shack/radioactive.nix> +    ## mqtt.shack +    <stockholm/krebs/2configs/shack/mqtt.nix>      ## Collect local statistics via collectd and send to collectd      <stockholm/krebs/2configs/stats/wolf-client.nix> -    ## write collectd statistics to wolf.shack -    <stockholm/krebs/2configs/collectd-base.nix> +      { services.influxdb.enable = true; }      <stockholm/krebs/2configs/shack/netbox.nix> +    <stockholm/krebs/2configs/shack/prometheus/server.nix> +    <stockholm/krebs/2configs/shack/prometheus/node.nix> +    <stockholm/krebs/2configs/shack/prometheus/unifi.nix> +    <stockholm/krebs/2configs/collectd-base.nix> # 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) @@ -76,10 +93,12 @@ 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; +      } +    ];      defaultGateway = "10.42.0.1";      nameservers = [ "10.42.0.100" "10.42.0.200" ]; @@ -120,11 +139,12 @@ in    '';    users.extraUsers.root.openssh.authorizedKeys.keys = [ -    config.krebs.users."0x4a6f".pubkey +    config.krebs.users."0x4A6F".pubkey      config.krebs.users.ulrich.pubkey      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}"  | 
