diff options
| author | taku0 <taku0@users.noreply.github.com> | 2021-03-03 19:35:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 19:35:16 +0900 |
| commit | 61706fc470d0838064f3453630468cefd685b090 (patch) | |
| tree | 034fc3d86eb6bc2c5e1ed5908057360645747636 /nixos | |
| parent | c16de94bd9abead5459fafde0a249f434f8b6b04 (diff) | |
| parent | 17cc2e7543946262fc33929dc85feac3b66b46d0 (diff) | |
Merge pull request #114853 from lourkeur/fix-string-escaping
nixos/kresd, nixos/dokuwiki, tests/fpm, build-bazel-package, libcutl: fix string escaping
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/kresd.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/dokuwiki.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/php/fpm.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 4131ff8be5d0..d7208354d4a7 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -8,9 +8,9 @@ let # Convert systemd-style address specification to kresd config line(s). # On Nix level we don't attempt to precisely validate the address specifications. mkListen = kind: addr: let - al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr; - al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr; - al_portOnly = builtins.match "()([0-9]\+)" addr; + al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr; + al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr; + al_portOnly = builtins.match "()([0-9]+)" addr; al = findFirst (a: a != null) (throw "services.kresd.*: incorrect address specification '${addr}'") [ al_v4 al_v6 al_portOnly ]; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 9567223ebc7b..1ce584c6a46d 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -329,7 +329,7 @@ in extraConfig = "internal;"; }; - locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { + locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = { extraConfig = "expires 365d;"; }; @@ -349,7 +349,7 @@ in ''; }; - locations."~ \.php$" = { + locations."~ \\.php$" = { extraConfig = '' try_files $uri $uri/ /doku.php; include ${pkgs.nginx}/conf/fastcgi_params; diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index f84394ccea45..02ea51794749 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -10,7 +10,7 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: { testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();"; in { root = "${testdir}/web"; - locations."~ \.php$".extraConfig = '' + locations."~ \\.php$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket}; fastcgi_index index.php; include ${pkgs.nginx}/conf/fastcgi_params; |