5 files changed, 55 insertions, 8 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 56d1b01b..7421125e 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -8,12 +8,12 @@
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
       ../2configs/main-laptop.nix #< base-gui
-      # <secrets/extra-hosts.nix>
 
       # environment
       ../2configs/tinc/retiolum.nix
 
     ];
+  networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
   # workaround for https://github.com/NixOS/nixpkgs/issues/16641
   services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
 
@@ -41,8 +41,10 @@
     get
     logstash
   #  docker
-    devpi-web
-    devpi-client
+    #devpi-web
+    #devpi-client
+    debmirror
+    ansible
   ];
   # virtualisation.docker.enable = true;
 
diff --git a/makefu/2configs/graphite-standalone.nix b/makefu/2configs/graphite-standalone.nix
index 15ae6b68..51c4c956 100644
--- a/makefu/2configs/graphite-standalone.nix
+++ b/makefu/2configs/graphite-standalone.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
   services.graphite = {
     web = {
       enable = true;
-      host = "0.0.0.0";
+      listenAddress = "0.0.0.0";
     };
     carbon = {
       enableCache = true;
diff --git a/makefu/2configs/save-diskspace.nix b/makefu/2configs/save-diskspace.nix
index cc2b29ca..4fd56976 100644
--- a/makefu/2configs/save-diskspace.nix
+++ b/makefu/2configs/save-diskspace.nix
@@ -1,9 +1,11 @@
 _:
 # TODO: do not check out nixpkgs master but fetch revision from github
 {
-  services.nixosManual.enable = false;
-  programs.man.enable = false;
-  services.journald.extraConfig = "SystemMaxUse=50M";
+  environment.noXlibs = true;
   nix.gc.automatic = true;
   nix.gc.dates = "03:10";
+  programs.info.enable = false;
+  programs.man.enable = false;
+  services.journald.extraConfig = "SystemMaxUse=50M";
+  services.nixosManual.enable = false;
 }
diff --git a/makefu/5pkgs/debmirror/default.nix b/makefu/5pkgs/debmirror/default.nix
new file mode 100644
index 00000000..67b34b6e
--- /dev/null
+++ b/makefu/5pkgs/debmirror/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, pkgs, fetchgit }:
+
+pkgs.perlPackages.buildPerlPackage rec {
+  name = "debmirror-${version}";
+  version = "2.25";
+
+  enableParallelBuilding = true;
+
+  src = fetchgit {
+    url = "https://anonscm.debian.org/git/collab-maint/debmirror.git";
+    rev = "c77e5caa15a4ab6497db5d819614387e647ccf4e";
+    sha256 = "1zp8ff9ajw22b4wradnw1hnfcpbyx5ibqzqgk6kp79nsj1dzmm0d";
+  };
+  preConfigure = ''
+    touch Makefile.PL
+  '';
+
+  outputs = [ "out" ];
+
+  buildPhase = ''
+    make
+  '';
+
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1/
+    cp debmirror mirror-size $out/bin
+    cp debmirror.1 $out/share/man/man1/
+  '';
+  propagatedBuildInputs = (with pkgs.perlPackages; [ LockFileSimple LWP]) ++
+    (with pkgs; [ rsync patch ed gzip diffutils findutils gnupg1 xz ]);
+
+  meta = {
+    description = "mirror apt repos";
+    homepage = https://tracker.debian.org/pkg/debmirror;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 0d375a51..8994b385 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -10,7 +10,9 @@ in
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     awesomecfg = callPackage ./awesomecfg {};
     bintray-upload = callPackage ./bintray-upload {};
-    inherit (callPackage ./devpi {}) devpi-web devpi-server;
+    debmirror = callPackage ./debmirror {};
+    inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
+    elchhub = callPackage ./elchhub {};
     f3 = callPackage ./f3 {};
     farpd = callPackage ./farpd {};
     git-xlsx-textconv = callPackage ./git-xlsx-textconv {};