commit 1f5f472a8a21f9bceed7f50c581007cb9c7ec3d6 · pyrox.dev/nixpkgs

+10 -2
nixos/modules/virtualisation/openvswitch.nix
···

       102
       102
        
                   --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \

     

       103
       103
        
                   --unixctl=ovsdb.ctl.sock \

     

       104
       104
        
                   --pidfile=/var/run/openvswitch/ovsdb.pid \

     

       105
       105
       +
                   --detach \

     

       105
       106
        
                   /var/db/openvswitch/conf.db

     

       106
       107
        
                 '';

     

       107
       108
        
               Restart = "always";

     

       108
       109
        
               RestartSec = 3;

     

       109
       110
        
               PIDFile = "/var/run/openvswitch/ovsdb.pid";

     

       111
       111
       +
               # Use service type 'forking' to correctly determine when ovsdb-server is ready.

     

       112
       112
       +
               Type = "forking";

     

       110
       113
        
             };

     

       111
       114
        
             postStart = ''

     

       112
       115
        
               ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init

     
···

       122
       125
        
             serviceConfig = {

     

       123
       126
        
               ExecStart = ''

     

       124
       127
        
                 ${cfg.package}/bin/ovs-vswitchd \

     

       125
       125
       -
                 --pidfile=/var/run/openvswitch/ovs-vswitchd.pid

     

       128
       128
       +
                 --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \

     

       129
       129
       +
                 --detach

     

       126
       130
        
               '';

     

       127
       131
        
               PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid";

     

       132
       132
       +
               # Use service type 'forking' to correctly determine when vswitchd is ready.

     

       133
       133
       +
               Type = "forking";

     

       128
       134
        
             };

     

       129
       135
        
           };

     

       130
       136
        
       

     
···

       149
       155
        
                 ${cfg.package}/bin/ovs-monitor-ipsec \

     

       150
       156
        
                   --root-prefix ${runDir}/ipsec \

     

       151
       157
        
                   --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \

     

       152
       152
       -
                   --monitor \

     

       158
       158
       +
                   --monitor --detach \

     

       153
       159
        
                   unix:/var/run/openvswitch/db.sock

     

       154
       160
        
               '';

     

       155
       161
        
               PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid";

     

       162
       162
       +
               # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready.

     

       163
       163
       +
               Type = "forking";

     

       156
       164
        
             };

     

       157
       165
        
       

     

       158
       166
        
             preStart = ''