From 02bf72f6d9416c35ffd37d00f40d4b54fe104c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ernest=20Wi=C5=9Bniewski?= <ernestwisniewski2@gmail.com>
Date: Tue, 2 May 2023 12:26:32 +0200
Subject: [PATCH] Caddy headers

---
 config/packages/messenger.yaml       |  4 ++--
 docker/caddy/Caddyfile               | 11 ++++++++++-
 templates/components/entry.html.twig |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml
index 3a425c3b..10e29cc9 100644
--- a/config/packages/messenger.yaml
+++ b/config/packages/messenger.yaml
@@ -9,7 +9,7 @@ framework:
       async:
         dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
         retry_strategy:
-          max_retries: 1
+          max_retries: 0
           delay: 60000
           multiplier: 2
           max_delay: 0
@@ -17,7 +17,7 @@ framework:
       async_ap:
         dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
         retry_strategy:
-          max_retries: 1
+          max_retries: 0
           delay: 65000
           multiplier: 2
           max_delay: 0
diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
index 8754a514..c5335fd4 100644
--- a/docker/caddy/Caddyfile
+++ b/docker/caddy/Caddyfile
@@ -9,6 +9,16 @@
 
 log
 
+@static {
+    path_regexp \.(ico|css|js|gif|jpg|webp|jpeg|png|svg|woff)$
+}
+header @static Cache-Control max-age=259200
+
+handle_path /media/cache/resolve* {
+    header Cache-Control "public" max-age=259200
+    try_files {uri} {uri}/ /index.php?{query_string}
+}
+
 route {
     root * /srv/app/public
     mercure {
@@ -30,5 +40,4 @@ route {
     php_fastcgi unix//var/run/php/php-fpm.sock
     encode zstd gzip
     file_server
-    header /media/* Cache-Control max-age=5184000
 }
diff --git a/templates/components/entry.html.twig b/templates/components/entry.html.twig
index 99943878..0984e4d4 100644
--- a/templates/components/entry.html.twig
+++ b/templates/components/entry.html.twig
@@ -124,7 +124,7 @@
                                 <button class="show-preview"
                                         data-action="preview#show"
                                         aria-label="{{ 'preview'|trans }}"
-                                        data-preview-url-param="{{ entry.url }}"
+                                        data-preview-url-param="{{ entry.url ?? uploaded_asset(entry.image.filePath) }}"
                                         data-preview-ratio-param="{{ entry.domain and entry.domain.shouldRatio ? true : false }}">
                                     <i class="fa-solid fa-photo-film"></i>
                                 </button>