makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

krebs 3 tinc_graphs: allow network different from retiolum

Browse source
This commit is contained in:
makefu 2016-06-23 16:45:06 +02:00
parent 0f3df5c0f4
commit a7310f526d
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
1 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
krebs/3modules/tinc_graphs.nix
View file

@ -20,6 +20,18 @@ let
default = "${pkgs.geolite-legacy}/share/GeoIP/GeoIPCity.dat"; default = "${pkgs.geolite-legacy}/share/GeoIP/GeoIPCity.dat";
}; };
hostsPath = mkOption {
type = types.str;
description = "Path to Hosts directory";
default = "${config.krebs.retiolum.hostsPackage}";
};
network = mkOption {
type = types.str;
description = "Tinc Network to use";
default = "retiolum";
};
nginx = { nginx = {
enable = mkEnableOption "enable tinc_graphs to be served with nginx"; enable = mkEnableOption "enable tinc_graphs to be served with nginx";
@ -73,10 +85,10 @@ let
}; };
imp = { imp = {
environment.systemPackages = [ pkgs.tinc_graphs]; environment.systemPackages = [ pkgs.tinc_graphs ];
systemd.timers.tinc_graphs = { systemd.timers.tinc_graphs = {
description = "Build Tinc Graphs via via timer"; description = "Build Tinc Graphs via via timer";
wantedBy = [ "timers.target"]; wantedBy = [ "timers.target" ];
timerConfig = cfg.timerConfig; timerConfig = cfg.timerConfig;
}; };
systemd.services.tinc_graphs = { systemd.services.tinc_graphs = {
@ -85,7 +97,8 @@ let
EXTERNAL_FOLDER = external_dir; EXTERNAL_FOLDER = external_dir;
INTERNAL_FOLDER = internal_dir; INTERNAL_FOLDER = internal_dir;
GEODB = cfg.geodbPath; GEODB = cfg.geodbPath;
TINC_HOSTPATH = config.krebs.retiolum.hostsPackage; TINC_HOSTPATH = cfg.hostsPath;
TINC_NETWORK = cfg.network;
}; };
restartIfChanged = true; restartIfChanged = true;
@ -103,7 +116,7 @@ let
cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/external/." "${external_dir}" cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/external/." "${external_dir}"
fi fi
''; '';
ExecStart = "${pkgs.tinc_graphs}/bin/all-the-graphs"; ExecStart = ''${pkgs.tinc_graphs}/bin/all-the-graphs "${cfg.network}"'';
ExecStartPost = pkgs.writeDash "tinc_graphs-post" '' ExecStartPost = pkgs.writeDash "tinc_graphs-post" ''
# TODO: this may break if workingDir is set to something stupid # TODO: this may break if workingDir is set to something stupid
@ -121,24 +134,26 @@ let
uid = genid "tinc_graphs"; uid = genid "tinc_graphs";
home = "/var/spool/tinc_graphs"; home = "/var/spool/tinc_graphs";
}; };
krebs.nginx = mkIf cfg.nginx.enable {
krebs.nginx.servers = mkIf cfg.nginx.enable { enable = mkDefault true;
tinc_graphs_complete = mkMerge [ cfg.nginx.complete { servers = {
locations = [ tinc_graphs_complete = mkMerge [ cfg.nginx.complete {
(nameValuePair "/" '' locations = [
autoindex on; (nameValuePair "/" ''
root ${internal_dir}; autoindex on;
'') root ${internal_dir};
]; '')
}] ; ];
tinc_graphs_anonymous = mkMerge [ cfg.nginx.anonymous { }] ;
locations = [ tinc_graphs_anonymous = mkMerge [ cfg.nginx.anonymous {
(nameValuePair "/" '' locations = [
autoindex on; (nameValuePair "/" ''
root ${external_dir}; autoindex on;
'') root ${external_dir};
]; '')
}]; ];
}];
};
}; };
}; };