summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2023-08-12 14:15:44 +0200
committerAtemu <atemu.main@gmail.com>2023-08-13 16:03:31 +0200
commit7706f570a73f48451657e708f7a9a174eb02755c (patch)
treebc521f926912462983dfb8c22ff0598b2fc536a5 /nixos
parent4d2624b2589669fddae466092843d419319c3f23 (diff)
downloadnixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar.gz
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar.bz2
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar.lz
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar.xz
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.tar.zst
nixpkgs-7706f570a73f48451657e708f7a9a174eb02755c.zip
dnscrypt-proxy: rename from dnscrypt-proxy2
An alias is added for dnscrypt-proxy2
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/dnscrypt-proxy2.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix
index de1ca0d2f20..4592a0c2f6b 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy2.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix
@@ -11,7 +11,7 @@ in
     settings = mkOption {
       description = lib.mdDoc ''
         Attrset that is converted and passed as TOML config file.
-        For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy2.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
+        For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
       '';
       example = literalExpression ''
         {
@@ -49,7 +49,7 @@ in
         passAsFile = [ "json" ];
       } ''
         ${if cfg.upstreamDefaults then ''
-          ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
+          ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
           ${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
         '' else ''
           cp $jsonPath config.json
@@ -80,7 +80,7 @@ in
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
         CacheDirectory = "dnscrypt-proxy";
         DynamicUser = true;
-        ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}";
+        ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}";
         LockPersonality = true;
         LogsDirectory = "dnscrypt-proxy";
         MemoryDenyWriteExecute = true;