Merge remote-tracking branch 'pnp/master'

This commit is contained in:
lassulus 2015-10-07 18:09:50 +02:00
commit a1ac4946eb

View file

@ -64,13 +64,11 @@ let
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"];
timerConfig = cfg.timerConfig; timerConfig = cfg.timerConfig;
}; };
systemd.services.tinc_graphs = { systemd.services.tinc_graphs = {
description = "Build Tinc Graphs"; description = "Build Tinc Graphs";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = { environment = {
EXTERNAL_FOLDER = external_dir; EXTERNAL_FOLDER = external_dir;
INTERNAL_FOLDER = internal_dir; INTERNAL_FOLDER = internal_dir;