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

softether: Fixed problems with using systemd services

Browse Source
This commit is contained in:
Rick Yang 2015-12-10 00:52:44 +08:00 committed by Rok Garbas
parent 5b8c871842
commit f8c3130e0f
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,11 +61,14 @@ in
dataDir = cfg.dataDir; dataDir = cfg.dataDir;
})) }))
]; ];
systemd.services.softether = { systemd.services."softether-init" = {
description = "SoftEther VPN services initial job"; description = "SoftEther VPN services initial task";
after = [ "network-interfaces.target" ]; wantedBy = [ "network-interfaces.target" ];
wantedBy = [ "multi-user.target" ]; serviceConfig = {
preStart = '' Type = "oneshot";
RemainAfterExit = false;
};
script = ''
for d in vpnserver vpnbridge vpnclient vpncmd; do for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
@ -81,12 +84,12 @@ in
(mkIf (cfg.vpnserver.enable) { (mkIf (cfg.vpnserver.enable) {
systemd.services.vpnserver = { systemd.services.vpnserver = {
description = "SoftEther VPN Server"; description = "SoftEther VPN Server";
after = [ "network-interfaces.target" ]; after = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "network-interfaces.target" ];
serviceConfig = { serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnserver start"; ExecStart = "${pkg}/bin/vpnserver start";
ExecStop = "${pkg}/bin/vpnserver stop"; ExecStop = "${pkg}/bin/vpnserver stop";
Type = "forking";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@ -101,12 +104,12 @@ in
(mkIf (cfg.vpnbridge.enable) { (mkIf (cfg.vpnbridge.enable) {
systemd.services.vpnbridge = { systemd.services.vpnbridge = {
description = "SoftEther VPN Bridge"; description = "SoftEther VPN Bridge";
after = [ "network-interfaces.target" ]; after = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "network-interfaces.target" ];
serviceConfig = { serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnbridge start"; ExecStart = "${pkg}/bin/vpnbridge start";
ExecStop = "${pkg}/bin/vpnbridge stop"; ExecStop = "${pkg}/bin/vpnbridge stop";
Type = "forking";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@ -121,12 +124,12 @@ in
(mkIf (cfg.vpnclient.enable) { (mkIf (cfg.vpnclient.enable) {
systemd.services.vpnclient = { systemd.services.vpnclient = {
description = "SoftEther VPN Client"; description = "SoftEther VPN Client";
after = [ "network-interfaces.target" ]; after = [ "softether-init.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "network-interfaces.target" ];
serviceConfig = { serviceConfig = {
Type = "forking";
ExecStart = "${pkg}/bin/vpnclient start"; ExecStart = "${pkg}/bin/vpnclient start";
ExecStop = "${pkg}/bin/vpnclient stop"; ExecStop = "${pkg}/bin/vpnclient stop";
Type = "forking";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient rm -rf ${cfg.dataDir}/vpnclient/vpnclient