pyrox.dev
lol
softether: improve service dependencies
+9
-7
nixos/modules/services/networking/softether.nix
+9
-7
nixos/modules/services/networking/softether.nix
···
63
63
];
64
64
systemd.services."softether-init" = {
65
65
description = "SoftEther VPN services initial task";
66
-
wantedBy = [ "network-interfaces.target" ];
67
66
serviceConfig = {
68
67
Type = "oneshot";
69
68
RemainAfterExit = false;
···
84
83
(mkIf (cfg.vpnserver.enable) {
85
84
systemd.services.vpnserver = {
86
85
description = "SoftEther VPN Server";
87
-
after = [ "softether-init.service" ];
88
-
wantedBy = [ "network-interfaces.target" ];
86
+
after = [ "softether-init.service" "network.target" ];
87
+
wants = [ "softether-init.service" ];
88
+
wantedBy = [ "multi-user.target" ];
89
89
serviceConfig = {
90
90
Type = "forking";
91
91
ExecStart = "${pkg}/bin/vpnserver start";
···
104
104
(mkIf (cfg.vpnbridge.enable) {
105
105
systemd.services.vpnbridge = {
106
106
description = "SoftEther VPN Bridge";
107
-
after = [ "softether-init.service" ];
108
-
wantedBy = [ "network-interfaces.target" ];
107
+
after = [ "softether-init.service" "network.target" ];
108
+
wants = [ "softether-init.service" ];
109
+
wantedBy = [ "multi-user.target" ];
109
110
serviceConfig = {
110
111
Type = "forking";
111
112
ExecStart = "${pkg}/bin/vpnbridge start";
···
124
125
(mkIf (cfg.vpnclient.enable) {
125
126
systemd.services.vpnclient = {
126
127
description = "SoftEther VPN Client";
127
-
after = [ "softether-init.service" ];
128
-
wantedBy = [ "network-interfaces.target" ];
128
+
after = [ "softether-init.service" "network.target" ];
129
+
wants = [ "softether-init.service" ];
130
+
wantedBy = [ "multi-user.target" ];
129
131
serviceConfig = {
130
132
Type = "forking";
131
133
ExecStart = "${pkg}/bin/vpnclient start";