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

nixos/openvswitch: /var/run -> /run

Browse Source
This commit is contained in:
Bob van der Linden 2018-12-19 22:45:15 +01:00
parent 8c1e00095a
commit d8dc1226f4
No known key found for this signature in database
GPG Key ID: 2A90361F99CF1795
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ in {
config = mkIf cfg.enable (let config = mkIf cfg.enable (let
# Where the communication sockets live # Where the communication sockets live
runDir = "/var/run/openvswitch"; runDir = "/run/openvswitch";
# The path to the an initialized version of the database # The path to the an initialized version of the database
db = pkgs.stdenv.mkDerivation { db = pkgs.stdenv.mkDerivation {
@ -99,13 +99,13 @@ in {
--certificate=db:Open_vSwitch,SSL,certificate \ --certificate=db:Open_vSwitch,SSL,certificate \
--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=/run/openvswitch/ovsdb.pid \
--detach \ --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 = "/run/openvswitch/ovsdb.pid";
# Use service type 'forking' to correctly determine when ovsdb-server is ready. # Use service type 'forking' to correctly determine when ovsdb-server is ready.
Type = "forking"; Type = "forking";
}; };
@ -123,10 +123,10 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${cfg.package}/bin/ovs-vswitchd \ ${cfg.package}/bin/ovs-vswitchd \
--pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ --pidfile=/run/openvswitch/ovs-vswitchd.pid \
--detach --detach
''; '';
PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; PIDFile = "/run/openvswitch/ovs-vswitchd.pid";
# Use service type 'forking' to correctly determine when vswitchd is ready. # Use service type 'forking' to correctly determine when vswitchd is ready.
Type = "forking"; Type = "forking";
}; };
@ -152,11 +152,11 @@ in {
ExecStart = '' ExecStart = ''
${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 /run/openvswitch/ovs-monitor-ipsec.pid \
--monitor --detach \ --monitor --detach \
unix:/var/run/openvswitch/db.sock unix:/run/openvswitch/db.sock
''; '';
PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; PIDFile = "/run/openvswitch/ovs-monitor-ipsec.pid";
# Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready.
Type = "forking"; Type = "forking";
}; };
@ -167,7 +167,7 @@ in {
ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey
ln -fs ${pkgs.writeScript "racoon-restart" '' ln -fs ${pkgs.writeScript "racoon-restart" ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
/var/run/current-system/sw/bin/systemctl $1 racoon /run/current-system/sw/bin/systemctl $1 racoon
''} ${runDir}/ipsec/etc/init.d/racoon ''} ${runDir}/ipsec/etc/init.d/racoon
''; '';
}; };