From 96a8a66cfb7fac2d4ca867c2dd91de2631649471 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 3 Oct 2015 19:57:38 +0200 Subject: add alsa-tools, working tinc_graphs --- makefu/5pkgs/alsa-tools/default.nix | 26 ++++++++++++++++++++++++++ makefu/5pkgs/default.nix | 11 +++++++++++ makefu/5pkgs/tinc_graphs/default.nix | 23 +++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 makefu/5pkgs/alsa-tools/default.nix create mode 100644 makefu/5pkgs/default.nix create mode 100644 makefu/5pkgs/tinc_graphs/default.nix diff --git a/makefu/5pkgs/alsa-tools/default.nix b/makefu/5pkgs/alsa-tools/default.nix new file mode 100644 index 000000000..9a672f048 --- /dev/null +++ b/makefu/5pkgs/alsa-tools/default.nix @@ -0,0 +1,26 @@ +{stdenv,alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk}: + +stdenv.mkDerivation rec { + name = "alsa-${alsaToolTarget}-${version}"; + alsaToolsName = "alsa-tools-${version}"; + version = "1.0.29"; + + src = fetchurl { + urls = [ + "ftp://ftp.alsa-project.org/pub/tools/${alsaToolsName}.tar.bz2" + "http://alsa.cybermirror.org/tools/${alsaToolsName}.tar.bz2" + + ]; + sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl"; + }; + sourceRoot = "${alsaToolsName}/${alsaToolTarget}/"; + buildInputs = [ alsaLib fltk13 gtk ncurses ]; + + meta = { + homepage = http://www.alsa-project.org/; + description = "ALSA tools - ${name}"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.makefu ]; + }; +} diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix new file mode 100644 index 000000000..15dab1100 --- /dev/null +++ b/makefu/5pkgs/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: + +let + inherit (pkgs) callPackage; +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 {}; +} diff --git a/makefu/5pkgs/tinc_graphs/default.nix b/makefu/5pkgs/tinc_graphs/default.nix new file mode 100644 index 000000000..c35a8b02e --- /dev/null +++ b/makefu/5pkgs/tinc_graphs/default.nix @@ -0,0 +1,23 @@ +{stdenv,fetchurl,pkgs,python3Packages, ... }: + +python3Packages.buildPythonPackage rec { + name = "tinc_graphs-${version}"; + version = "0.2.8"; + 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 = "1rvy07ybjpqlsf9qizdp0zyq4ibd6w74k4glbbkw0x7j3j2skzdk"; + }; + preFixup = with pkgs;'' + wrapProgram $out/bin/build-graphs --prefix PATH : "${imagemagick}/bin:${graphviz}/bin" + ''; + meta = { + homepage = http://krebsco.de/; + description = "Create Graphs from Tinc Stats"; + license = stdenv.lib.licenses.wtfpl; + }; +} + -- cgit v1.2.3 From 41df3589f6f3aab31443a486a9d7e82f4e9ff559 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 4 Oct 2015 20:55:30 +0200 Subject: rmdir: bump ipaddr --- krebs/3modules/tv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 96ab48e6b..49204c74f 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -146,7 +146,7 @@ with import ../../4lib { inherit lib; }; dc = "tv"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["104.233.84.70"]; + addrs4 = ["167.88.34.182"]; aliases = [ "rmdir.internet" ]; -- cgit v1.2.3 From 8167fe985a9d97ec4fd9c5b1c2d559deba100642 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:01:21 +0200 Subject: define spam-ml in krebs/3modules --- krebs/3modules/default.nix | 17 +++++++++++++++++ tv/2configs/exim-smarthost.nix | 8 -------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9ec9d0a8a..6db39701a 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,6 +105,23 @@ let combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts ); in lib.mapAttrs' (name: value: nameValuePair (("zones/" + name)) ({ text=value; })) all-zones; + krebs.exim-smarthost.internet-aliases = let + format = from: to: + # TODO assert is-retiolum-mail-address to; + { inherit from; + to = if typeOf to == "list" + then concatMapStringsSep "," (getAttr "mail") to + else to.mail; }; + in mapAttrsToList format (with config.krebs.users; let + spam-ml = [ + lass + makefu + tv + ]; + in { + "spam@krebsco.de" = spam-ml; + }); + services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in mkIf (privkey != null) (mkForce [privkey]); diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 811c8e4c7..07acd593b 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -26,14 +26,6 @@ # TODO lists@smtp.retiolum [consul] { from = "postmaster@krebsco.de"; to = tv.mail; } - - { from = "spam@krebsco.de"; - to = pkgs.lib.concatStringsSep "," [ - tv.mail - "lass@mors.retiolum" - makefu.mail - ]; - } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From a626c2a070bbc24a37dffc3953842b02db6a703a Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:03:51 +0200 Subject: postmaster@krebsco.de -> spam-ml --- krebs/3modules/default.nix | 1 + tv/2configs/exim-smarthost.nix | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6db39701a..7a67be17e 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -119,6 +119,7 @@ let tv ]; in { + "postmaster@krebsco.de" = spam-ml; # RFC 822 "spam@krebsco.de" = spam-ml; }); diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 07acd593b..dc2ef2395 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -23,9 +23,6 @@ # TODO killme (wo wird die benutzt?) { from = "tv@cd.retiolum"; to = tv.mail; } - - # TODO lists@smtp.retiolum [consul] - { from = "postmaster@krebsco.de"; to = tv.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 214bd7a3b2500dd7af3cc10c43b9e9d6eaed8b8c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:06:04 +0200 Subject: register retiolum "internet" aliases --- krebs/3modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 7a67be17e..35e62afb5 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -121,6 +121,12 @@ let in { "postmaster@krebsco.de" = spam-ml; # RFC 822 "spam@krebsco.de" = spam-ml; + # XXX These are no internet aliases + # XXX exim-retiolum hosts should be able to relay to retiolum addresses + "lass@retiolum" = lass; + "makefu@retiolum" = makefu; + "spam@retiolum" = spam-ml; + "tv@retiolum" = tv; }); services.openssh.hostKeys = -- cgit v1.2.3 From 0e93d668772d1c19da76b38ee73ca07f211230be Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:07:14 +0200 Subject: tv: cleanup internet-aliases --- tv/2configs/exim-smarthost.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index dc2ef2395..f5f63d284 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -12,17 +12,10 @@ "10.243.13.37" ]; internet-aliases = with config.krebs.users; [ + { from = "mirko@viljetic.de"; to = mv.mail; } { from = "tomislav@viljetic.de"; to = tv.mail; } - - # (mindestens) lisp-stammtisch und elli haben die: - { from = "tv@viljetic.de"; to = tv.mail; } - { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; } - - { from = "mirko@viljetic.de"; to = mv.mail; } - - # TODO killme (wo wird die benutzt?) - { from = "tv@cd.retiolum"; to = tv.mail; } + { from = "tv@viljetic.de"; to = tv.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 059037f5ec15754563ab1627d3056f128c986f38 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:29:04 +0200 Subject: register krebsco.de internet aliases --- krebs/3modules/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 35e62afb5..430194405 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -120,7 +120,10 @@ let ]; in { "postmaster@krebsco.de" = spam-ml; # RFC 822 + "lass@krebsco.de" = lass; + "makefu@krebsco.de" = makefu; "spam@krebsco.de" = spam-ml; + "tv@krebsco.de" = tv; # XXX These are no internet aliases # XXX exim-retiolum hosts should be able to relay to retiolum addresses "lass@retiolum" = lass; -- cgit v1.2.3