commit 840dbe7defaec0edc6a987ef4719a537bb672bcc · pyrox.dev/nixpkgs

nixos/modules/rename.nix

···

       75
       75
        
           # DNSCrypt-proxy

     

       76
       76
        
           (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])

     

       77
       77
        
       

     

       78
       78
       +
           (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ])

     

       79
       79
       +
       

     

       78
       80
        
           # Options that are obsolete and have no replacement.

     

       79
       81
        
           (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])

     

       80
       82
        
           (mkRemovedOptionModule [ "programs" "bash" "enable" ])

+24 -23

nixos/modules/services/networking/hostapd.nix

···

       2
       2
        
       

     

       3
       3
        
       # TODO:

     

       4
       4
        
       #

     

       5
       5
       -
       # asserts 

     

       5
       5
       +
       # asserts

     

       6
       6
        
       #   ensure that the nl80211 module is loaded/compiled in the kernel

     

       7
       7
       -
       #   hwMode must be a/b/g

     

       8
       8
       -
       #   channel must be between 1 and 13 (maybe)

     

       9
       7
        
       #   wpa_supplicant and hostapd on the same wireless interface doesn't make any sense

     

       10
       10
       -
       #   perhaps an assertion that there is a dhcp server and a dns server on the IP address serviced by the hostapd?

     

       11
       8
        
       

     

       12
       9
        
       with lib;

     

       13
       10
        
       

     

       14
       11
        
       let

     

       15
       12
        
       

     

       16
       13
        
         cfg = config.services.hostapd;

     

       17
       17
       -
         

     

       18
       18
       -
         configFile = pkgs.writeText "hostapd.conf"  

     

       19
       19
       -
           ''

     

       14
       14
       +
       

     

       15
       15
       +
         configFile = pkgs.writeText "hostapd.conf" ''

     

       20
       16
        
           interface=${cfg.interface}

     

       21
       17
        
           driver=${cfg.driver}

     

       22
       18
        
           ssid=${cfg.ssid}

     
···

       37
       33
        
             wpa_passphrase=${cfg.wpaPassphrase}

     

       38
       34
        
             '' else ""}

     

       39
       35
        
       

     

       40
       40
       -
           ${cfg.extraCfg}

     

       41
       41
       -
           '' ;

     

       36
       36
       +
           ${cfg.extraConfig}

     

       37
       37
       +
         '' ;

     

       42
       38
        
       

     

       43
       39
        
       in

     

       44
       40
        
       

     
···

       65
       61
        
       

     

       66
       62
        
             interface = mkOption {

     

       67
       63
        
               default = "";

     

       68
       68
       -
               example = "wlan0";

     

       64
       64
       +
               example = "wlp2s0";

     

       69
       65
        
               description = ''

     

       70
       70
       -
                 The interfaces <command>hostapd</command> will use. 

     

       66
       66
       +
                 The interfaces <command>hostapd</command> will use.

     

       71
       67
        
               '';

     

       72
       68
        
             };

     

       73
       69
        
       

     
···

       89
       85
        
             };

     

       90
       86
        
       

     

       91
       87
        
             hwMode = mkOption {

     

       92
       92
       -
               default = "b";

     

       93
       93
       -
               example = "g";

     

       88
       88
       +
               default = "g";

     

       94
       89
        
               type = types.string;

     

       95
       90
        
               description = ''

     

       96
       91
        
                 Operation mode.

     
···

       98
       93
        
               '';

     

       99
       94
        
             };

     

       100
       95
        
       

     

       101
       101
       -
             channel = mkOption { 

     

       96
       96
       +
             channel = mkOption {

     

       102
       97
        
               default = 7;

     

       103
       98
        
               example = 11;

     

       104
       99
        
               type = types.int;

     

       105
       105
       -
               description = 

     

       106
       106
       -
                 ''

     

       100
       100
       +
               description = ''

     

       107
       101
        
                 Channel number (IEEE 802.11)

     

       108
       102
        
                 Please note that some drivers do not use this value from

     

       109
       103
        
                 <command>hostapd</command> and the channel will need to be configured

     

       110
       104
        
                 separately with <command>iwconfig</command>.

     

       111
       111
       -
                 '';

     

       105
       105
       +
               '';

     

       112
       106
        
             };

     

       113
       107
        
       

     

       114
       108
        
             group = mkOption {

     
···

       131
       125
        
               default = "my_sekret";

     

       132
       126
        
               example = "any_64_char_string";

     

       133
       127
        
               type = types.string;

     

       134
       134
       -
               description = 

     

       135
       135
       -
                 ''

     

       128
       128
       +
               description = ''

     

       136
       129
        
                 WPA-PSK (pre-shared-key) passphrase. Clients will need this

     

       137
       130
        
                 passphrase to associate with this access point.

     

       138
       131
        
                 Warning: This passphrase will get put into a world-readable file in

     

       139
       132
        
                 the Nix store!

     

       140
       140
       -
                 '';

     

       133
       133
       +
               '';

     

       141
       134
        
             };

     

       142
       135
        
       

     

       143
       143
       -
             extraCfg = mkOption {

     

       136
       136
       +
             extraConfig = mkOption {

     

       144
       137
        
               default = "";

     

       145
       138
        
               example = ''

     

       146
       139
        
                 auth_algo=0

     
···

       158
       151
        
       

     

       159
       152
        
         config = mkIf cfg.enable {

     

       160
       153
        
       

     

       154
       154
       +
           assertions = [

     

       155
       155
       +
             { assertion = (cfg.hwMode == "a" || cfg.hwMode == "b" || cfg.hwMode == "g");

     

       156
       156
       +
               message = "hwMode must be a/b/g";

     

       157
       157
       +
             }

     

       158
       158
       +
             { assertion = (cfg.channel >= 1 && cfg.channel <= 13);

     

       159
       159
       +
               message = "channel must be between 1 and 13";

     

       160
       160
       +
             }];

     

       161
       161
       +
       

     

       161
       162
        
           environment.systemPackages =  [ pkgs.hostapd ];

     

       162
       163
        
       

     

       163
       164
        
           systemd.services.hostapd =

     

       164
       165
        
             { description = "hostapd wireless AP";

     

       165
       166
        
       

     

       166
       166
       -
               path = [ pkgs.hostapd ]; 

     

       167
       167
       +
               path = [ pkgs.hostapd ];

     

       167
       168
        
               wantedBy = [ "network.target" ];

     

       168
       169
        
       

     

       169
       170
        
               after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"];

     

       170
       171
        
       

     

       171
       171
       -
               serviceConfig = 

     

       172
       172
       +
               serviceConfig =

     

       172
       173
        
                 { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";

     

       173
       174
        
                   Restart = "always";

     

       174
       175
        
                 };