nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "openvswitch module: do not fork services"

Browse Source 
This reverts commit fcab752abf.
This commit is contained in:
Thomas Strobel 2015-09-24 14:51:44 +02:00
parent 0d08b2c599
commit 1f5f472a8a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/virtualisation/openvswitch.nix
View File

@ -102,11 +102,14 @@ in {
--bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
--unixctl=ovsdb.ctl.sock \ --unixctl=ovsdb.ctl.sock \
--pidfile=/var/run/openvswitch/ovsdb.pid \ --pidfile=/var/run/openvswitch/ovsdb.pid \
--detach \
/var/db/openvswitch/conf.db /var/db/openvswitch/conf.db
''; '';
Restart = "always"; Restart = "always";
RestartSec = 3; RestartSec = 3;
PIDFile = "/var/run/openvswitch/ovsdb.pid"; PIDFile = "/var/run/openvswitch/ovsdb.pid";
# Use service type 'forking' to correctly determine when ovsdb-server is ready.
Type = "forking";
}; };
postStart = '' postStart = ''
${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
@ -122,9 +125,12 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${cfg.package}/bin/ovs-vswitchd \ ${cfg.package}/bin/ovs-vswitchd \
--pidfile=/var/run/openvswitch/ovs-vswitchd.pid --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \
--detach
''; '';
PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid";
# Use service type 'forking' to correctly determine when vswitchd is ready.
Type = "forking";
}; };
}; };
@ -149,10 +155,12 @@ in {
${cfg.package}/bin/ovs-monitor-ipsec \ ${cfg.package}/bin/ovs-monitor-ipsec \
--root-prefix ${runDir}/ipsec \ --root-prefix ${runDir}/ipsec \
--pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \
--monitor \ --monitor --detach \
unix:/var/run/openvswitch/db.sock unix:/var/run/openvswitch/db.sock
''; '';
PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid";
# Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready.
Type = "forking";
}; };
preStart = '' preStart = ''