From 34f0d4bb8e7c6330f3aed07ac9beb894b7d1b5e6 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Fri, 6 Jun 2025 11:40:09 +0300 Subject: [PATCH] conf: minor formatting fixes --- angie/j2cfg/00-headers.yml.j2 | 2 +- angie/snip/cache.j2mod | 58 +++++++++++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/angie/j2cfg/00-headers.yml.j2 b/angie/j2cfg/00-headers.yml.j2 index 5a1f06a..2af765a 100644 --- a/angie/j2cfg/00-headers.yml.j2 +++ b/angie/j2cfg/00-headers.yml.j2 @@ -1,6 +1,6 @@ {%- set transparent = false -%} {%- if env.NGX_HTTP_TRANSPARENT_PROXY != None -%} - {%- set transparent = (env.NGX_HTTP_TRANSPARENT_PROXY | from_gobool) -%} + {%- set transparent = env.NGX_HTTP_TRANSPARENT_PROXY | from_gobool -%} {%- endif -%} --- diff --git a/angie/snip/cache.j2mod b/angie/snip/cache.j2mod index a26d072..38cc61a 100644 --- a/angie/snip/cache.j2mod +++ b/angie/snip/cache.j2mod @@ -1,55 +1,55 @@ -{%- macro proxy_cache_path(name, size='1m') %} -{%- set path = '/run/ngx/cache'|join_prefix('proxy_' + name) -%} -{%- set zone_file = '/run/ngx/lib'|join_prefix('proxy_' + name + '.keys') -%} +{% macro proxy_cache_path(name, size='1m') %} + {%- set path = join_prefix('/run/ngx/cache', 'proxy_' + name) -%} + {%- set zone_file = join_prefix('/run/ngx/lib', 'proxy_' + name + '.keys') -%} proxy_cache_path {{ path | ngx_esc }} {{ "keys_zone={}:{}:file={}".format(name, size, zone_file) | ngx_esc }} -{%- for v in varargs %} + {%- for v in varargs %} {{ v | ngx_esc }} -{%- endfor %} -{%- for k, v in kwargs|dictsort %} + {%- endfor %} + {%- for k, v in kwargs|dictsort %} {{ "{}={}".format(k, v) | ngx_esc }} -{%- endfor %} + {%- endfor %} ; -{%- endmacro %} +{% endmacro %} -{%- macro fastcgi_cache_path(name, size='1m') %} -{%- set path = '/run/ngx/cache'|join_prefix('fastcgi_' + name) -%} +{% macro fastcgi_cache_path(name, size='1m') %} + {%- set path = join_prefix('/run/ngx/cache', 'fastcgi_' + name) -%} fastcgi_cache_path {{ path | ngx_esc }} {{ "keys_zone={}:{}".format(name, size) | ngx_esc }} -{%- for v in varargs %} + {%- for v in varargs %} {{ v | ngx_esc }} -{%- endfor %} -{%- for k, v in kwargs|dictsort %} + {%- endfor %} + {%- for k, v in kwargs|dictsort %} {{ "{}={}".format(k, v) | ngx_esc }} -{%- endfor %} + {%- endfor %} ; -{%- endmacro %} +{% endmacro %} -{%- macro scgi_cache(name, size='1m') %} -{%- set path = '/run/ngx/cache'|join_prefix('scgi_' + name) -%} +{% macro scgi_cache(name, size='1m') %} + {%- set path = join_prefix('/run/ngx/cache', 'scgi_' + name) -%} scgi_cache {{ path | ngx_esc }} {{ "keys_zone={}:{}".format(name, size) | ngx_esc }} -{%- for v in varargs %} + {%- for v in varargs %} {{ v | ngx_esc }} -{%- endfor %} -{%- for k, v in kwargs|dictsort %} + {%- endfor %} + {%- for k, v in kwargs|dictsort %} {{ "{}={}".format(k, v) | ngx_esc }} -{%- endfor %} + {%- endfor %} ; -{%- endmacro %} +{% endmacro %} -{%- macro uwsgi_cache(name, size='1m') %} -{%- set path = '/run/ngx/cache'|join_prefix('uwsgi_' + name) -%} +{% macro uwsgi_cache(name, size='1m') %} + {%- set path = join_prefix('/run/ngx/cache', 'uwsgi_' + name) -%} uwsgi_cache {{ path | ngx_esc }} {{ "keys_zone={}:{}".format(name, size) | ngx_esc }} -{%- for v in varargs %} + {%- for v in varargs %} {{ v | ngx_esc }} -{%- endfor %} -{%- for k, v in kwargs|dictsort %} + {%- endfor %} + {%- for k, v in kwargs|dictsort %} {{ "{}={}".format(k, v) | ngx_esc }} -{%- endfor %} + {%- endfor %} ; -{%- endmacro %} +{% endmacro %}