summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-03-09 17:55:45 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2017-03-10 18:54:51 +0100
commitc0a8a9205b590828c2a174f751c80908e632f734 (patch)
tree11f15d028bbd64f2146e370bf1cac5d0a696479b /nixos
parent563c8e14965e15833c465330dfba1d94854285cf (diff)
downloadnixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar.gz
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar.bz2
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar.lz
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar.xz
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.tar.zst
nixlib-c0a8a9205b590828c2a174f751c80908e632f734.zip
nixos/dnscrypt-proxy: inline option renamings
In an effort to make the module more self-contained.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/rename.nix3
-rw-r--r--nixos/modules/services/networking/dnscrypt-proxy.nix4
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0b609287f63a..af8b34b5e5cb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -103,9 +103,6 @@ with lib;
     (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
 
-    # DNSCrypt-proxy
-    (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
-
     (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ])
 
     # Enlightenment
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 8520cc5e9ebc..d65296f422ee 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -307,4 +307,8 @@ in
     };
     })
     ]);
+
+  imports = [
+    (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
+  ];
 }