diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2018-12-19 22:45:15 +0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2019-03-24 21:15:34 +0100 |
| commit | d8dc1226f431a9bd1f4b08df10ffddd38ff1960f (patch) | |
| tree | 57d24ac297637bf25722d608d03adf94203d55be /nixos/modules/virtualisation/openvswitch.nix | |
| parent | 8c1e00095a44164ac434e92843debeba6351c70f (diff) | |
| download | nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar.gz nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar.bz2 nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar.lz nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar.xz nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.tar.zst nixpkgs-d8dc1226f431a9bd1f4b08df10ffddd38ff1960f.zip | |
nixos/openvswitch: /var/run -> /run
Diffstat (limited to 'nixos/modules/virtualisation/openvswitch.nix')
| -rw-r--r-- | nixos/modules/virtualisation/openvswitch.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index bb8b9172f23..47e07e7432c 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable (let # Where the communication sockets live - runDir = "/var/run/openvswitch"; + runDir = "/run/openvswitch"; # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { @@ -99,13 +99,13 @@ in { --certificate=db:Open_vSwitch,SSL,certificate \ --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ - --pidfile=/var/run/openvswitch/ovsdb.pid \ + --pidfile=/run/openvswitch/ovsdb.pid \ --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; 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. Type = "forking"; }; @@ -123,10 +123,10 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --pidfile=/run/openvswitch/ovs-vswitchd.pid \ --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. Type = "forking"; }; @@ -152,11 +152,11 @@ in { ExecStart = '' ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ - --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ + --pidfile /run/openvswitch/ovs-monitor-ipsec.pid \ --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. Type = "forking"; }; @@ -167,7 +167,7 @@ in { ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey ln -fs ${pkgs.writeScript "racoon-restart" '' #!${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 ''; }; |