summary refs log tree commit diff
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2018-06-30 21:44:19 +0800
committerGitHub <noreply@github.com>2018-06-30 21:44:19 +0800
commitdd608f80dbbfd39e072b11174fad0e3751e2d388 (patch)
treef06c4592874695c10b3e99bf57e818254bf6c6dd
parenta276404d44bf6b5c11dc17621bfedfa7d6e8ab9c (diff)
parentd8f6ca1afa36d45e1cb5496c1ba8725cb0ad14df (diff)
downloadnixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar.gz
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar.bz2
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar.lz
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar.xz
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.tar.zst
nixlib-dd608f80dbbfd39e072b11174fad0e3751e2d388.zip
Merge pull request #42709 from jollheef/master
hostapd: use WPA2 instead of WPA1 by default
-rw-r--r--nixos/doc/manual/release-notes/rl-1809.xml5
-rw-r--r--nixos/modules/services/networking/hostapd.nix2
2 files changed, 6 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 667437a24135..51e77d24a74e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -330,6 +330,11 @@ inherit (pkgs.nixos {
      will be added to <literal>environment.systemPackages</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The module <option>services.networking.hostapd</option> now uses WPA2 by default.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 63f56437d1c8..3af0441a89d8 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -29,7 +29,7 @@ let
     ctrl_interface_group=${cfg.group}
 
     ${if cfg.wpa then ''
-      wpa=1
+      wpa=2
       wpa_passphrase=${cfg.wpaPassphrase}
       '' else ""}