From c1b3dbef6c8372e2eeb95fd307c25f6726266630 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Oct 2015 18:06:46 +0100
Subject: [PATCH 1/4] wry: listen for graphs.retiolum
---
1systems/wry.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/1systems/wry.nix b/1systems/wry.nix
index 6627d87..3baf31d 100644
--- a/1systems/wry.nix
+++ b/1systems/wry.nix
@@ -47,7 +47,7 @@ in {
# TODO: remove hard-coded hostname
complete = {
listen = [ "${internal-ip}:80" ];
- server-names = [ "graphs.wry" ];
+ server-names = [ "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
};
anonymous = {
listen = [ "${external-ip}:80" ] ;
From 4e1319dcc04da8548a266f5a40ae436527f3369c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Oct 2015 21:54:59 +0100
Subject: [PATCH 2/4] k 3 tinc_graphs: is now completely self-contained
---
5pkgs/tinc_graphs/default.nix | 26 --------------------------
1 file changed, 26 deletions(-)
delete mode 100644 5pkgs/tinc_graphs/default.nix
diff --git a/5pkgs/tinc_graphs/default.nix b/5pkgs/tinc_graphs/default.nix
deleted file mode 100644
index 62a787d..0000000
--- a/5pkgs/tinc_graphs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv,fetchurl,pkgs,python3Packages, ... }:
-
-python3Packages.buildPythonPackage rec {
- name = "tinc_graphs-${version}";
- version = "0.3.6";
- propagatedBuildInputs = with pkgs;[
- python3Packages.pygeoip
- ## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat
- ];
- src = fetchurl {
- url = "https://pypi.python.org/packages/source/t/tinc_graphs/tinc_graphs-${version}.tar.gz";
- sha256 = "0ghdx9aaipmppvc2b6cgks4nxw6zsb0fhjrmnisbx7rz0vjvzc74";
- };
- preFixup = with pkgs;''
- wrapProgram $out/bin/build-graphs --prefix PATH : "$out/bin"
- wrapProgram $out/bin/all-the-graphs --prefix PATH : "${imagemagick}/bin:${graphviz}/bin:$out/bin"
- wrapProgram $out/bin/tinc-stats2json --prefix PATH : "${tinc}/bin"
- '';
-
- meta = {
- homepage = http://krebsco.de/;
- description = "Create Graphs from Tinc Stats";
- license = stdenv.lib.licenses.wtfpl;
- };
-}
-
From 8bb8a19275a1bece4efbb6096136873ffeeabe65 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Oct 2015 00:02:51 +0100
Subject: [PATCH 3/4] tinc_graphs: clean up mv {makefu,krebs}
---
5pkgs/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/5pkgs/default.nix b/5pkgs/default.nix
index 7945b6e..b9661e1 100644
--- a/5pkgs/default.nix
+++ b/5pkgs/default.nix
@@ -7,6 +7,5 @@ in
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
- tinc_graphs = callPackage ./tinc_graphs {};
awesomecfg = callPackage ./awesomecfg {};
}
From 686679c2a940bf2cff9746573d4f94851117cc35 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Oct 2015 00:47:10 +0100
Subject: [PATCH 4/4] m 1 pnp: make urlwatch verbose, update url list
---
1systems/pnp.nix | 2 ++
2configs/urlwatch.nix | 2 ++
2 files changed, 4 insertions(+)
diff --git a/1systems/pnp.nix b/1systems/pnp.nix
index e7ceca6..80600e9 100644
--- a/1systems/pnp.nix
+++ b/1systems/pnp.nix
@@ -32,6 +32,8 @@
# ../2configs/graphite-standalone.nix
];
+ krebs.urlwatch.verbose = true;
+
krebs.Reaktor.enable = true;
krebs.Reaktor.debug = true;
krebs.Reaktor.nickname = "Reaktor|bot";
diff --git a/2configs/urlwatch.nix b/2configs/urlwatch.nix
index 933cb93..01e5e8b 100644
--- a/2configs/urlwatch.nix
+++ b/2configs/urlwatch.nix
@@ -10,6 +10,8 @@
https://api.github.com/repos/ovh/python-ovh/tags
https://api.github.com/repos/embray/d2to1/tags
http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
+ https://github.com/bepasty/bepasty-server/tags
+ https://pypi.python.org/simple/xstatic/
];
};