From 602a39c31825629f03c7e65169f040d73305c3e7 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 16 Sep 2019 23:40:32 +0000 Subject: nixos/rspamd: fix fancy unicode quote --- nixos/modules/services/mail/rspamd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 89aa9d17ff7f..4db35d9e89ab 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -68,7 +68,7 @@ let replaced with rspamd_proxy. ''; apply = let - from = "services.rspamd.workers.\”${name}\".type"; + from = "services.rspamd.workers.\"${name}\".type"; files = options.type.files; warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`"; in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x; -- cgit 1.4.1 From 1aadcee68a3857459499208c376ef687584f72b9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:18:14 +0000 Subject: nixos/less: fix escape --- nixos/modules/programs/less.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index e19935b77caf..75b3e707d576 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -54,8 +54,8 @@ in type = types.attrsOf types.str; default = {}; example = { - h = "noaction 5\e("; - l = "noaction 5\e)"; + h = "noaction 5\\e("; + l = "noaction 5\\e)"; }; description = "Defines new command keys."; }; -- cgit 1.4.1 From fbd2b55715f10a5b8b2e15992dbb1ddebc9e7e29 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:19:28 +0000 Subject: nixos/graphite: fix escape --- nixos/modules/services/monitoring/graphite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 64cb6c3da1e5..f7874af3df29 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -239,7 +239,7 @@ in { description = "Any metrics received which match one of the experssions will be dropped."; default = null; type = types.nullOr types.str; - example = "^some\.noisy\.metric\.prefix\..*"; + example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; whitelist = mkOption { -- cgit 1.4.1 From b384420f2c9365236c2dc35e95321e53df4d2f1d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:20:05 +0000 Subject: nixos/prosody: fix escape --- nixos/modules/services/networking/prosody.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1ae063aa6bb5..7a503e711665 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -465,7 +465,7 @@ in modules_enabled = { - ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList + ${ lib.concatStringsSep "\n " (lib.mapAttrsToList (name: val: optionalString val "${toLua name};") cfg.modules) } ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)} -- cgit 1.4.1 From 08195254aa9a554a903a165617abd0e51a2c550e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:22:11 +0000 Subject: nixos/matomo: fix string escape --- nixos/modules/services/web-apps/matomo.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index d9f840408cc8..8e0f9f8582d8 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -105,8 +105,8 @@ in { default = null; example = { serverAliases = [ - "matomo.$\{config.networking.domain\}" - "stats.$\{config.networking.domain\}" + "matomo.\${config.networking.domain}" + "stats.\${config.networking.domain}" ]; enableACME = false; }; @@ -115,7 +115,7 @@ in { Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the is - ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}, + ${user}.''${config.networking.hostName}.''${config.networking.domain}, SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; @@ -275,7 +275,7 @@ in { fastcgi_pass unix:${phpSocket}; ''; # Any other attempt to access any php files is forbidden - locations."~* ^.+\.php$".extraConfig = '' + locations."~* ^.+\\.php$".extraConfig = '' return 403; ''; # Disallow access to unneeded directories @@ -284,7 +284,7 @@ in { return 403; ''; # Disallow access to several helper files - locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' + locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' return 403; ''; # No crawling of this site for bots that obey robots.txt - no useful information here. -- cgit 1.4.1 From 4641b683f6d8c8e769ae849316de1522ae18179f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:22:56 +0000 Subject: nixos/restya-board: fix string escape --- nixos/modules/services/web-apps/restya-board.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 1e7882488ac6..2c2f36ac598a 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -235,7 +235,7 @@ in locations."/".root = "${runDir}/client"; - locations."~ \.php$" = { + locations."~ \\.php$" = { tryFiles = "$uri =404"; extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; @@ -246,7 +246,7 @@ in ''; }; - locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { + locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { root = "${runDir}/client"; extraConfig = '' if (-f $request_filename) { -- cgit 1.4.1 From 432a2d73be9a4cc70a030abc8a8d8e445fc814f9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:23:51 +0000 Subject: nixos/tt-rss: fix string escape --- nixos/modules/services/web-apps/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index abe4748591e9..b92e34498949 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -548,7 +548,7 @@ let index = "index.php"; }; - locations."~ \.php$" = { + locations."~ \\.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; -- cgit 1.4.1 From 48086fbd702d83ae0839272724350c73184f22fb Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Sep 2019 00:27:13 +0000 Subject: nixos/matomo: fix escape --- nixos/modules/services/web-apps/matomo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8e0f9f8582d8..1e34aff8d171 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -115,7 +115,7 @@ in { Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the is - ${user}.''${config.networking.hostName}.''${config.networking.domain}, + ''${user}.''${config.networking.hostName}.''${config.networking.domain}, SSL is active, and certificates are acquired via ACME. If this is set to null (the default), no nginx virtualHost will be configured. ''; -- cgit 1.4.1