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

openvswitch module: do not fork services

Browse Source
This commit is contained in:
Thomas Strobel 2015-09-24 10:24:54 +02:00 committed by Thomas Strobel
parent 502014b07e
commit fcab752abf
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,13 +92,11 @@ 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";
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
@ -114,11 +112,9 @@ 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";
Type = "forking";
}; };
}; };
@ -143,11 +139,10 @@ 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 --detach \ --monitor \
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";
Type = "forking";
}; };
preStart = '' preStart = ''