Merge remote-tracking branch 'pnp/master'

1systems/wry.nix

@@ -9,9 +9,8 @@ in {
     ../2configs/base.nix
     ../2configs/base-sources.nix
     ../2configs/tinc-basic-retiolum.nix
-    {
-    }
   ];
+
   networking.firewall.allowPing = true;
   networking.interfaces.enp2s1.ip4 = [
       {
@@ -29,6 +28,15 @@ in {
 
   # prepare graphs
   nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
+  krebs.nginx.enable = true;
+  makefu.tinc_graphs.enable = true;
+  makefu.tinc_graphs.krebsNginx = {
+    enable = true;
+    hostnames_complete = [ "graphs.wry" "graphs.wry.retiolum" ];
+    # TODO: remove hard-coded path
+    hostnames_anonymous = [ "graphs.krebsco.de" ];
+  };
+  networking.firewall.allowedTCPPorts = [80];
 
   krebs.build = {
     user = config.krebs.users.makefu;

3modules/default.nix

@@ -1,19 +1,8 @@
-{ config, lib, ... }:
+_:
 
-with lib;
+{
-let
+  imports = [
-  cfg = config.krebs;
+    ./tinc_graphs.nix
+  ];
+}
 
-  out = {
-    imports = [
-    ];
-    options.krebs = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = { };
-
-  imp = { };
-
-in
-out

3modules/tinc_graphs.nix

@@ -0,0 +1,122 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.makefu.tinc_graphs;
+  internal_dir = "${cfg.workingDir}/internal";
+  external_dir = "${cfg.workingDir}/external";
+
+  out = {
+    options.makefu.tinc_graphs = api;
+    config = mkIf cfg.enable imp ;
+  };
+
+  api = {
+    enable = mkEnableOption "tinc graphs";
+
+    geodbPath = mkOption {
+      type = types.str;
+      description = "Path to geocitydb, defaults to geolite-legacy";
+      default = "${pkgs.geolite-legacy}/share/GeoIP/GeoIPCity.dat";
+    };
+
+    krebsNginx = {
+      # configure krebs nginx to serve the new graphs
+      enable = mkEnableOption "tinc_graphs nginx";
+
+      hostnames_complete = {
+        #TODO: this is not a secure way to serve these graphs,better listen to
+        #      the correct interface, krebs.nginx does not support this yet
+
+        type = with types; listOf str;
+        description = "hostname which serves complete graphs";
+        default = config.krebs.build.host.name;
+      };
+
+      hostnames_anonymous = {
+        type = with types; listOf str;
+        description = ''
+          hostname which serves anonymous graphs
+          must be different from hostname_complete
+        '';
+      };
+    };
+
+    workingDir = mkOption {
+      type = types.str;
+      description = ''
+        Path to working dir, will create interal and external/.
+        Defaults to the new users home dir which defaults to
+        /var/cache/tinc_graphs'';
+      default = config.users.extraUsers.tinc_graphs.home;
+    };
+
+    timerConfig = mkOption {
+      type = with types; attrsOf str;
+      default = {
+        OnCalendar = "*:0/15";
+      };
+    };
+  };
+
+  imp = {
+    environment.systemPackages = [ pkgs.tinc_graphs];
+    systemd.timers.tinc_graphs = {
+      description = "Build Tinc Graphs via via timer";
+
+      timerConfig = cfg.timerConfig;
+    };
+    systemd.services.tinc_graphs = {
+      description = "Build Tinc Graphs";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      environment = {
+        EXTERNAL_FOLDER = external_dir;
+        INTERNAL_FOLDER = internal_dir;
+        GEODB = cfg.geodbPath;
+      };
+
+      restartIfChanged = true;
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStartPre = pkgs.writeScript "tinc_graphs-init" ''
+          #!/bin/sh
+          mkdir -p "${external_dir}" "${internal_dir}"
+        '';
+        ExecStart = "${pkgs.tinc_graphs}/bin/all-the-graphs";
+        User = "root"; # tinc cannot be queried as user, 
+                       #  seems to be a tinc-pre issue
+        privateTmp = true;
+      };
+    };
+
+    users.extraUsers.tinc_graphs = {
+      uid = 3925439960; #genid tinc_graphs
+      home = "/var/cache/tinc_graphs";
+      createHome = true;
+    };
+
+    krebs.nginx.servers = mkIf cfg.krebsNginx.enable {
+      tinc_graphs_complete = {
+        server-names = cfg.krebsNginx.hostnames_complete;
+        locations = [
+          (nameValuePair "/" ''
+            root ${internal_dir};
+          '')
+        ];
+      };
+      tinc_graphs_anonymous = {
+        server-names = cfg.krebsNginx.hostnames_anonymous;
+        #server-names = [ "dick" ];
+        locations = [
+          (nameValuePair "/" ''
+            root ${external_dir};
+          '')
+        ];
+      };
+    };
+  };
+
+in
+out

5pkgs/default.nix

@@ -4,7 +4,7 @@ let
   inherit (pkgs) callPackage;
 in
 {
-   alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
+  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 {};

5pkgs/tinc_graphs/default.nix

@@ -2,17 +2,19 @@
 
 python3Packages.buildPythonPackage rec {
   name = "tinc_graphs-${version}";
-  version = "0.2.8";
+  version = "0.2.9";
   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";
+    sha256 = "0fm063qhjlb8g1xahwcqqrd2dxgd38wwi55rhl1k5chr7zajsqfz";
   };
   preFixup = with pkgs;''
-    wrapProgram $out/bin/build-graphs --prefix PATH : "${imagemagick}/bin:${graphviz}/bin"
+    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/;