mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
Merge pull request #12015 from mayflower/wpa_supplicant-service
Basic Declaritive Network Configuration in wpa_supplicant Service
This commit is contained in:
commit
94e6323de0
@ -18,8 +18,18 @@ NixOS will start wpa_supplicant for you if you enable this setting:
|
|||||||
networking.wireless.enable = true;
|
networking.wireless.enable = true;
|
||||||
</programlisting>
|
</programlisting>
|
||||||
|
|
||||||
NixOS currently does not generate wpa_supplicant's
|
NixOS lets you specify networks for wpa_supplicant declaratively:
|
||||||
configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
|
<programlisting>
|
||||||
|
networking.wireless.networks = {
|
||||||
|
echelon = {
|
||||||
|
psk = "abcdefgh";
|
||||||
|
};
|
||||||
|
"free.wifi" = {};
|
||||||
|
}
|
||||||
|
</programlisting>
|
||||||
|
|
||||||
|
When no networks are set it will default to using a configuration file at
|
||||||
|
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
|
||||||
yourself to define wireless networks, WPA keys and so on (see
|
yourself to define wireless networks, WPA keys and so on (see
|
||||||
wpa_supplicant.conf(5)).
|
wpa_supplicant.conf(5)).
|
||||||
</para>
|
</para>
|
||||||
|
@ -3,44 +3,23 @@
|
|||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.networking.wireless;
|
cfg = config.networking.wireless;
|
||||||
configFile = "/etc/wpa_supplicant.conf";
|
configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
|
||||||
|
${optionalString cfg.userControlled.enable ''
|
||||||
ifaces =
|
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
|
||||||
cfg.interfaces ++
|
update_config=1''}
|
||||||
optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
|
${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
|
||||||
|
network={
|
||||||
in
|
ssid="${ssid}"
|
||||||
|
${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
|
||||||
{
|
${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
|
||||||
|
}
|
||||||
###### interface
|
'') cfg.networks)}
|
||||||
|
'' else "/etc/wpa_supplicant.conf";
|
||||||
|
in {
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
networking.WLANInterface = mkOption {
|
|
||||||
default = "";
|
|
||||||
description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.wireless = {
|
networking.wireless = {
|
||||||
enable = mkOption {
|
enable = mkEnableOption "wpa_supplicant";
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = ''
|
|
||||||
Whether to start <command>wpa_supplicant</command> to scan for
|
|
||||||
and associate with wireless networks. Note: NixOS currently
|
|
||||||
does not manage <command>wpa_supplicant</command>'s
|
|
||||||
configuration file, <filename>${configFile}</filename>. You
|
|
||||||
should edit this file yourself to define wireless networks,
|
|
||||||
WPA keys and so on (see
|
|
||||||
<citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry>), or use
|
|
||||||
networking.wireless.userControlled.* to allow users to add entries
|
|
||||||
through <command>wpa_cli</command> and <command>wpa_gui</command>.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
interfaces = mkOption {
|
interfaces = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
@ -58,6 +37,34 @@ in
|
|||||||
description = "Force a specific wpa_supplicant driver.";
|
description = "Force a specific wpa_supplicant driver.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networks = mkOption {
|
||||||
|
type = types.attrsOf (types.submodule {
|
||||||
|
options = {
|
||||||
|
psk = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
The network's pre-shared key in plaintext defaulting
|
||||||
|
to being a network without any authentication.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
description = ''
|
||||||
|
The network definitions to automatically connect to when
|
||||||
|
<command>wpa_supplicant</command> is running. If this
|
||||||
|
parameter is left empty wpa_supplicant will use
|
||||||
|
/etc/wpa_supplicant.conf as the configuration file.
|
||||||
|
'';
|
||||||
|
default = {};
|
||||||
|
example = literalExample ''
|
||||||
|
echelon = {
|
||||||
|
psk = "abcdefgh";
|
||||||
|
};
|
||||||
|
"free.wifi" = {};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
userControlled = {
|
userControlled = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
@ -68,10 +75,8 @@ in
|
|||||||
to depend on a large package such as NetworkManager just to pick nearby
|
to depend on a large package such as NetworkManager just to pick nearby
|
||||||
access points.
|
access points.
|
||||||
|
|
||||||
When you want to use this, make sure ${configFile} doesn't exist.
|
When using a declarative network specification you cannot persist any
|
||||||
It will be created for you.
|
settings via wpa_gui or wpa_cli.
|
||||||
|
|
||||||
Currently it is also necessary to explicitly specify networking.wireless.interfaces.
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -85,35 +90,23 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
config = mkMerge [
|
||||||
###### implementation
|
(mkIf cfg.enable {
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.wpa_supplicant ];
|
environment.systemPackages = [ pkgs.wpa_supplicant ];
|
||||||
|
|
||||||
services.dbus.packages = [ pkgs.wpa_supplicant ];
|
services.dbus.packages = [ pkgs.wpa_supplicant ];
|
||||||
|
|
||||||
# FIXME: start a separate wpa_supplicant instance per interface.
|
# FIXME: start a separate wpa_supplicant instance per interface.
|
||||||
jobs.wpa_supplicant =
|
systemd.services.wpa_supplicant = let
|
||||||
{ description = "WPA Supplicant";
|
ifaces = cfg.interfaces;
|
||||||
|
in {
|
||||||
|
description = "WPA Supplicant";
|
||||||
|
|
||||||
wantedBy = [ "network.target" ];
|
wantedBy = [ "network.target" ];
|
||||||
|
|
||||||
path = [ pkgs.wpa_supplicant ];
|
path = [ pkgs.wpa_supplicant ];
|
||||||
|
|
||||||
preStart = ''
|
script = ''
|
||||||
touch -a ${configFile}
|
|
||||||
chmod 600 ${configFile}
|
|
||||||
'' + optionalString cfg.userControlled.enable ''
|
|
||||||
if [ ! -s ${configFile} ]; then
|
|
||||||
echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
|
|
||||||
echo "update_config=1" >> ${configFile}
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
script =
|
|
||||||
''
|
|
||||||
${if ifaces == [] then ''
|
${if ifaces == [] then ''
|
||||||
for i in $(cd /sys/class/net && echo *); do
|
for i in $(cd /sys/class/net && echo *); do
|
||||||
DEVTYPE=
|
DEVTYPE=
|
||||||
@ -129,20 +122,17 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
powerManagement.resumeCommands =
|
powerManagement.resumeCommands = ''
|
||||||
''
|
|
||||||
${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
|
${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
|
||||||
'';
|
'';
|
||||||
|
|
||||||
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
|
|
||||||
message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
|
|
||||||
|
|
||||||
# Restart wpa_supplicant when a wlan device appears or disappears.
|
# Restart wpa_supplicant when a wlan device appears or disappears.
|
||||||
services.udev.extraRules =
|
services.udev.extraRules = ''
|
||||||
''
|
|
||||||
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
|
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
|
||||||
'';
|
'';
|
||||||
|
})
|
||||||
};
|
{
|
||||||
|
meta.maintainers = with lib.maintainers; [ globin ];
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user