From 00c1f607f8d22048e7f3e1fff3e915faa719a102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=20Nam=C3=A8che?= Date: Mon, 9 Feb 2026 08:45:45 +0300 Subject: [PATCH] caddy: rename cors_allow_* -> cors_allowed_* --- seb4itik/byow/roles/caddy/templates/Caddyfile | 10 ++++----- seb4itik/byow/roles/caddy/vars/main.yml | 22 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/seb4itik/byow/roles/caddy/templates/Caddyfile b/seb4itik/byow/roles/caddy/templates/Caddyfile index 63aafa5..17ca44d 100644 --- a/seb4itik/byow/roles/caddy/templates/Caddyfile +++ b/seb4itik/byow/roles/caddy/templates/Caddyfile @@ -249,14 +249,14 @@ {% endif %} {% if site.cors | default(caddy_sites_defaults.cors) %} -{% for origin in site.cors_allow_origins | mandatory %} +{% for origin in site.cors_allowed_origins | mandatory %} import cors {{ origin }} "{{ - site.cors_allow_methods | default(caddy_sites_defaults.cors_allow_methods) | listadddel(site.cors_allow_methods_add | default([]), site.cors_allow_methods_del | default([])) | join(', ') }}" "{{ - site.cors_allow_headers | default(caddy_sites_defaults.cors_allow_headers) | listadddel(site.cors_allow_headers_add | default([]), site.cors_allow_headers_del | default([])) | join(', ') }}" "{{ - site.cors_allow_credentials | default(caddy_sites_defaults.cors_allow_credentials) | ternary('true', 'false') }}" "{{ + site.cors_allowed_methods | default(caddy_sites_defaults.cors_allowed_methods) | listadddel(site.cors_allowed_methods_add | default([]), site.cors_allowed_methods_del | default([])) | join(', ') }}" "{{ + site.cors_allowed_headers | default(caddy_sites_defaults.cors_allowed_headers) | listadddel(site.cors_allowed_headers_add | default([]), site.cors_allowed_headers_del | default([])) | join(', ') }}" "{{ + site.cors_allowed_credentials | default(caddy_sites_defaults.cors_allowed_credentials) | ternary('true', 'false') }}" "{{ site.cors_max_age | default(caddy_sites_defaults.cors_max_age) }}" "{{ site.cors_vary | default(caddy_sites_defaults.cors_vary) | listadddel(site.cors_vary_add | default([]), site.cors_vary_del | default([])) | join(', ') }}" "{{ - site.cors_expose_headers | default(caddy_sites_defaults.cors_expose_headers) | listadddel(site.cors_expose_headers_add | default([]), site.cors_expose_headers_del | default([])) | join(', ') }}" + site.cors_exposed_headers | default(caddy_sites_defaults.cors_exposed_headers) | listadddel(site.cors_exposed_headers_add | default([]), site.cors_exposed_headers_del | default([])) | join(', ') }}" {% endfor %} import cors-deny {% endif %} diff --git a/seb4itik/byow/roles/caddy/vars/main.yml b/seb4itik/byow/roles/caddy/vars/main.yml index 15d197f..668bb94 100644 --- a/seb4itik/byow/roles/caddy/vars/main.yml +++ b/seb4itik/byow/roles/caddy/vars/main.yml @@ -58,35 +58,35 @@ caddy_global_sites_defaults: # CORS - Cross Origin Resource Sharing cors: false - cors_allow_origins: [] # Minimum 1 required - cors_allow_methods: + cors_allowed_origins: [] # Minimum 1 required + cors_allowed_methods: # These variables can be used for adding and removing extensions from the list: - # cors_allow_methods_add: ["XXX"] - # cors_allow_methods_del: ["YYY"] + # cors_allowed_methods_add: ["XXX"] + # cors_allowed_methods_del: ["YYY"] - "GET" - "HEAD" - "POST" - "OPTIONS" - cors_allow_headers: + cors_allowed_headers: # These variables can be used for adding and removing extensions from the list: - # cors_allow_headers_add: ["Xxx"] - # cors_allow_headers_del: ["Yyy"] + # cors_allowed_headers_add: ["Xxx"] + # cors_allowed_headers_del: ["Yyy"] - "Cache-Control" - "Content-Type" - "If-Modified-Since" - "Range" - "User-Agent" cors_max_age: 3600 - cors_allow_credentials: false + cors_allowed_credentials: false cors_vary: # These variables can be used for adding and removing extensions from the list: # cors_vary_add: ["Xxx"] # cors_vary_del: ["Yyy"] - "Origin" - cors_expose_headers: + cors_exposed_headers: # These variables can be used for adding and removing extensions from the list: - # cors_expose_headers_add: ["Xxx"] - # cors_expose_headers_del: ["Yyy"] + # cors_exposed_headers_add: ["Xxx"] + # cors_exposed_headers_del: ["Yyy"] - "Content-Length" - "Content-Range"