Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

k 3 tinc_graphs: is now completely self-contained

Browse Source
This commit is contained in:
makefu 2015-10-25 21:54:59 +01:00
parent bb16a38df6
commit 6425831452
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
krebs/3modules/tinc_graphs.nix
View File

@ -95,8 +95,12 @@ let
ExecStartPre = pkgs.writeScript "tinc_graphs-init" '' ExecStartPre = pkgs.writeScript "tinc_graphs-init" ''
#!/bin/sh #!/bin/sh
mkdir -p "${internal_dir}" "${external_dir}"
if ! test -e "${cfg.workingDir}/internal/index.html"; then if ! test -e "${cfg.workingDir}/internal/index.html"; then
cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/internal/" "${internal_dir}" cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/internal/." "${internal_dir}"
fi
if ! test -e "${cfg.workingDir}/external/index.html"; then
cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/external/." "${external_dir}"
fi fi
''; '';
@ -118,7 +122,6 @@ let
users.extraUsers.tinc_graphs = { users.extraUsers.tinc_graphs = {
uid = 3925439960; #genid tinc_graphs uid = 3925439960; #genid tinc_graphs
home = "/var/spool/tinc_graphs"; home = "/var/spool/tinc_graphs";
createHome = true;
}; };
krebs.nginx.servers = mkIf cfg.nginx.enable { krebs.nginx.servers = mkIf cfg.nginx.enable {

4
makefu/5pkgs/tinc_graphs/default.nix → krebs/5pkgs/tinc_graphs/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
name = "tinc_graphs-${version}"; name = "tinc_graphs-${version}";
version = "0.3.6"; version = "0.3.8";
propagatedBuildInputs = with pkgs;[ propagatedBuildInputs = with pkgs;[
python3Packages.pygeoip python3Packages.pygeoip
## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat ## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat
]; ];
src = fetchurl { src = fetchurl {
url = "https://pypi.python.org/packages/source/t/tinc_graphs/tinc_graphs-${version}.tar.gz"; url = "https://pypi.python.org/packages/source/t/tinc_graphs/tinc_graphs-${version}.tar.gz";
sha256 = "0ghdx9aaipmppvc2b6cgks4nxw6zsb0fhjrmnisbx7rz0vjvzc74"; sha256 = "0jc014ipx9pbx5dwi9s5n921c2c26m5vvzrvpjmca550gpdqd5f4";
}; };
preFixup = with pkgs;'' preFixup = with pkgs;''
wrapProgram $out/bin/build-graphs --prefix PATH : "$out/bin" wrapProgram $out/bin/build-graphs --prefix PATH : "$out/bin"