public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gogoclient: change working dir before starting

Browse Source 
otherwise state files are placed in /
This commit is contained in:
Mathijs Kwik 2012-12-27 13:38:37 +01:00
parent 244ed6ae71
commit 183829cf99
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/services/networking/gogoclient.nix
View File

@ -59,13 +59,14 @@ in
networking.enableIPv6 = true; networking.enableIPv6 = true;
boot.systemd.services.gogoclient = { boot.systemd.services.gogoclient = {
description = "ipv6 tunnel"; description = "ipv6 tunnel";
after = [ "network.target" ]; after = [ "network.target" ];
requires = [ "network.target" ];
preStart = let authMethod = if cfg.password == "" then "anonymous" else "any"; in unitConfig.RequiresMountsFor = "/var/lib/gogoc";
''
script = let authMethod = if cfg.password == "" then "anonymous" else "any"; in ''
mkdir -p -m 700 /var/lib/gogoc mkdir -p -m 700 /var/lib/gogoc
cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | \ cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | \
${pkgs.gnused}/bin/sed \ ${pkgs.gnused}/bin/sed \
@ -74,18 +75,12 @@ in
-e "s|^server=.*|server=${cfg.server}|" \ -e "s|^server=.*|server=${cfg.server}|" \
-e "s|^auth_method=.*|auth_method=${authMethod}|" \ -e "s|^auth_method=.*|auth_method=${authMethod}|" \
-e "s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf -e "s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf
cd /var/lib/gogoc
exec ${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf
''; '';
serviceConfig.ExecStart = "${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf";
restartTriggers = attrValues cfg;
} // optionalAttrs cfg.autorun { } // optionalAttrs cfg.autorun {
wantedBy = [ "ip-up.target" ]; wantedBy = [ "ip-up.target" ];
partOf = [ "ip-up.target" ]; partOf = [ "ip-up.target" ];
}; };
}; };