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

softether: improve service dependencies

Browse Source
This commit is contained in:
Alexander Ried 2016-09-12 16:30:15 +02:00
parent 9819cdc71a
commit fbf0abf4af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/softether.nix
View File

@ -63,7 +63,6 @@ in
]; ];
systemd.services."softether-init" = { systemd.services."softether-init" = {
description = "SoftEther VPN services initial task"; description = "SoftEther VPN services initial task";
wantedBy = [ "network-interfaces.target" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = false; RemainAfterExit = false;
@ -84,8 +83,9 @@ in
(mkIf (cfg.vpnserver.enable) { (mkIf (cfg.vpnserver.enable) {
systemd.services.vpnserver = { systemd.services.vpnserver = {
description = "SoftEther VPN Server"; description = "SoftEther VPN Server";
after = [ "softether-init.service" ]; after = [ "softether-init.service" "network.target" ];
wantedBy = [ "network-interfaces.target" ]; wants = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${pkg}/bin/vpnserver start"; ExecStart = "${pkg}/bin/vpnserver start";
@ -104,8 +104,9 @@ in
(mkIf (cfg.vpnbridge.enable) { (mkIf (cfg.vpnbridge.enable) {
systemd.services.vpnbridge = { systemd.services.vpnbridge = {
description = "SoftEther VPN Bridge"; description = "SoftEther VPN Bridge";
after = [ "softether-init.service" ]; after = [ "softether-init.service" "network.target" ];
wantedBy = [ "network-interfaces.target" ]; wants = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${pkg}/bin/vpnbridge start"; ExecStart = "${pkg}/bin/vpnbridge start";
@ -124,8 +125,9 @@ in
(mkIf (cfg.vpnclient.enable) { (mkIf (cfg.vpnclient.enable) {
systemd.services.vpnclient = { systemd.services.vpnclient = {
description = "SoftEther VPN Client"; description = "SoftEther VPN Client";
after = [ "softether-init.service" ]; after = [ "softether-init.service" "network.target" ];
wantedBy = [ "network-interfaces.target" ]; wants = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${pkg}/bin/vpnclient start"; ExecStart = "${pkg}/bin/vpnclient start";