summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-10-13 02:30:57 +0200
committermakefu <github@syntax-fehler.de>2019-10-13 02:30:57 +0200
commitbce0555f05b261927dbbfb3e59d4ee6b927bf704 (patch)
tree83b0fbad71af71cc7c88573032524ea70e0478e5
parent8a5837f86c72c13129e4c6c1bb6904e1fd0ae29e (diff)
move shack prometheus from wolf to puyak
-rw-r--r--krebs/1systems/puyak/config.nix2
-rw-r--r--krebs/1systems/wolf/config.nix4
-rw-r--r--makefu/5pkgs/python-firetv/default.nix40
3 files changed, 4 insertions, 42 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 6321b6cc4..6493c6df4 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -14,6 +14,8 @@
<stockholm/krebs/2configs/news.nix>
<stockholm/krebs/2configs/news-spam.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
+ <stockholm/krebs/2configs/shack/prometheus/server.nix>
+ <stockholm/krebs/2configs/shack/prometheus/unifi.nix>
<stockholm/krebs/2configs/shack/gitlab-runner.nix>
## Collect local statistics via collectd and send to collectd
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 6e53637e6..e47c43fe1 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -62,9 +62,9 @@ in
<stockholm/krebs/2configs/shack/netbox.nix>
# prometheus.shack
- <stockholm/krebs/2configs/shack/prometheus/server.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/shack/prometheus/unifi.nix>
# grafana.shack
<stockholm/krebs/2configs/shack/grafana.nix>
diff --git a/makefu/5pkgs/python-firetv/default.nix b/makefu/5pkgs/python-firetv/default.nix
deleted file mode 100644
index 593f4e718..000000000
--- a/makefu/5pkgs/python-firetv/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, pkgs, python2Packages, ... }:
-# requires libusb1 from unstable
-with python2Packages; let
-
- python-adb = buildPythonPackage rec {
- pname = "adb";
- version = "1.2.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0v4my47ikgkbq04gdllpx6kql5cfh7dnpq2fk72x03z74mqri7v8";
- };
-
- propagatedBuildInputs = [ libusb1 m2crypto ];
- meta = {
- homepage = https://github.com/google/python-adb;
- description = "Python ADB + Fastboot implementation";
- license = lib.licenses.asl20;
- };
- };
-in
- buildPythonPackage rec {
- name = "python-firetv-${version}";
- version = "1.0.5";
-
- src = pkgs.fetchFromGitHub {
- owner = "happyleavesaoc";
- repo = "python-firetv";
- # rev = version;
- rev = "55406c6";
- sha256 = "1r2yighilchs0jvcvbngkjxkk7gp588ikcl64x7afqzxc6zxv7wp";
- };
-
- propagatedBuildInputs = [ python-adb flask pyyaml ];
- meta = {
- homepage = https://github.com/happyleavesaoc/python-firetv;
- description = "provides state informations and some control of an amazon firetv";
- license = lib.licenses.mit;
- };
-}