commit c85f2b20e677e72fd3334f48b0cb0123dbaee16d · pyrox.dev/nixpkgs

+19 -3
nixos/modules/services/networking/openvpn.nix
···

       29
       29
        
               done

     

       30
       30
        
       

     

       31
       31
        
               ${cfg.up}

     

       32
       32
       +
               ${optionalString cfg.updateResolvConf

     

       33
       33
       +
                  "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}

     

       32
       34
        
             '';

     

       33
       35
        
       

     

       34
       36
        
             downScript = ''

     

       35
       37
        
               #! /bin/sh

     

       36
       38
        
               export PATH=${path}

     

       39
       39
       +
               ${optionalString cfg.updateResolvConf

     

       40
       40
       +
                  "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}

     

       37
       41
        
               ${cfg.down}

     

       38
       42
        
             '';

     

       39
       43
        
       

     

       40
       44
        
             configFile = pkgs.writeText "openvpn-config-${name}"

     

       41
       45
        
               ''

     

       42
       46
        
                 errors-to-stderr

     

       43
       43
       -
                 ${optionalString (cfg.up != "" || cfg.down != "") "script-security 2"}

     

       47
       47
       +
                 ${optionalString (cfg.up != "" || cfg.down != "" || cfg.updateResolvConf) "script-security 2"}

     

       44
       48
        
                 ${cfg.config}

     

       45
       45
       -
                 ${optionalString (cfg.up != "") "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}

     

       46
       46
       -
                 ${optionalString (cfg.down != "") "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"}

     

       49
       49
       +
                 ${optionalString (cfg.up != "" || cfg.updateResolvConf)

     

       50
       50
       +
                     "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}

     

       51
       51
       +
                 ${optionalString (cfg.down != "" || cfg.updateResolvConf)

     

       52
       52
       +
                     "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"}

     

       47
       53
        
               '';

     

       48
       54
        
       

     

       49
       55
        
           in {

     
···

       143
       149
        
                 default = true;

     

       144
       150
        
                 type = types.bool;

     

       145
       151
        
                 description = "Whether this OpenVPN instance should be started automatically.";

     

       152
       152
       +
               };

     

       153
       153
       +
       

     

       154
       154
       +
               updateResolvConf = mkOption {

     

       155
       155
       +
                 default = false;

     

       156
       156
       +
                 type = types.bool;

     

       157
       157
       +
                 description = ''

     

       158
       158
       +
                   Use the script from the update-resolv-conf package to automatically

     

       159
       159
       +
                   update resolv.conf with the DNS information provided by openvpn. The

     

       160
       160
       +
                   script will be run after the "up" commands and before the "down" commands.

     

       161
       161
       +
                 '';

     

       146
       162
        
               };

     

       147
       163
        
       

     

       148
       164
        
             };