diff options
| author | tv <tv@shackspace.de> | 2015-10-14 19:24:36 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-14 19:24:36 +0200 |
| commit | 335ea5a4c153b53e103d1b5d7c1a693c07296042 (patch) | |
| tree | 820bd884e97b55d9f22783853ce6e594a3b43e88 /krebs | |
| parent | 96f4248b65ff1539eded24572ae1805b27c53d50 (diff) | |
| parent | 69098a48472be34c5efc6ce449074482e73cbcd6 (diff) | |
Merge remote-tracking branch 'mors/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/Reaktor/default.nix | 4 | ||||
| -rw-r--r-- | krebs/Zhosts/go | 13 |
3 files changed, 3 insertions, 15 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 9dbc597ed..afedf95f2 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -21,6 +21,7 @@ with import ../../4lib { inherit lib; }; aliases = [ "echelon.retiolum" "cgit.echelon.retiolum" + "go.retiolum" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/Reaktor/default.nix index 524782081..c38aa6423 100644 --- a/krebs/5pkgs/Reaktor/default.nix +++ b/krebs/5pkgs/Reaktor/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonPackage rec { name = "Reaktor-${version}"; - version = "0.4.3"; + version = "0.5.0"; propagatedBuildInputs = with pkgs;[ python3Packages.docopt python3Packages.requests2 ]; src = fetchurl { url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; - sha256 = "1rvfw9vg7i7z2ah7m5k3zik2b92d3xdaqa8am62qw6vgvmxcmfp4"; + sha256 = "1npag52xmnyqv56z0anyf6xf00q0smfzsippal0xdbxrfj7s8qim"; }; meta = { homepage = http://krebsco.de/; diff --git a/krebs/Zhosts/go b/krebs/Zhosts/go deleted file mode 100644 index de9ebeb78..000000000 --- a/krebs/Zhosts/go +++ /dev/null @@ -1,13 +0,0 @@ -Subnet = 10.243.109.132 -Subnet = 42:f9f0:be1f:b191:116a:3db0:d546:70d2 -# dn42 routing -Subnet = 172.22.0.0/15 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApKt/lYqRgl4KE1ouSi5nbt7n7FEjECkGtkRhLFDJs0uWNvPj7wEh -nTtqzk7lJ8upHgmNN+1w98n2bcJ7Qcbz8vCcMEO7MXdlzGH9vet/g6ZgQ/Z1ijHl -IxYeH7yyBDLoJ2gghMhiSF0cezFDmNKPMhN+cGr9Lou54igK3I5CMIMN8cx0Fu0G -uLAxvnZfxIzzCnrF9xvZ6i3g/rEcaGjxmAysCW8SQdRmBKlkzQaUbLy39V2Z5y6m -SWR7gIGgMVCkpSeWUVSi05wgnMhoEu6LEYTBy/3bPK96O/Y7JBVpYUHqk/ya2PNR -eaHfEpCrKsek4t/5hcLk64Eo/ydzeU+gAQIDAQAB ------END RSA PUBLIC KEY----- |