From 15b76a68eebd92a3fca2c3ba93969df4d4031750 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Mon, 14 Apr 2025 11:47:34 +0200
Subject: [PATCH 1/5] *.vcl: Rename backend from 'ezplatform' to 'ibexa'.

---
 docs/varnish/vcl/parameters.vcl | 8 ++++----
 docs/varnish/vcl/varnish5.vcl   | 2 +-
 docs/varnish/vcl/varnish6.vcl   | 2 +-
 docs/varnish/vcl/varnish7.vcl   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/varnish/vcl/parameters.vcl b/docs/varnish/vcl/parameters.vcl
index b211df5..e07e234 100644
--- a/docs/varnish/vcl/parameters.vcl
+++ b/docs/varnish/vcl/parameters.vcl
@@ -2,9 +2,9 @@
 // Replace the host to fit your setup
 //
 // For additional example see:
-// https://github.com/ezsystems/ezplatform/blob/master/doc/docker/entrypoint/varnish/parameters.vcl
+// https://github.com/ibexa/docker/blob/main/docker/entrypoint/varnish/parameters.vcl
 
-backend ezplatform {
+backend ibexa {
     .host = "127.0.0.1"; // Replace with hostname/ip of the application server
     .port = "80";
 }
@@ -12,8 +12,8 @@ backend ezplatform {
 // ACL for invalidators IP
 //
 // Alternative using HTTPCACHE_VARNISH_INVALIDATE_TOKEN : VCL code also allows for token based invalidation, to use it define a
-//      shared secret using env variable HTTPCACHE_VARNISH_INVALIDATE_TOKEN and eZ Platform will also use that for configuring this
-//      bundle. This is prefered for setups such as platform.sh/eZ Platform Cloud, where circular service dependency is
+//      shared secret using env variable HTTPCACHE_VARNISH_INVALIDATE_TOKEN and Ibexa DXP will also use that for configuring this
+//      bundle. This is prefered for setups such as Ibexa Cloud, where circular service dependency is
 //      unwanted. If you use this, use a strong cryptological secure hash & make sure to keep the token secret.
 // Use ez_purge_acl for invalidation by token.
 acl invalidators {
diff --git a/docs/varnish/vcl/varnish5.vcl b/docs/varnish/vcl/varnish5.vcl
index 4704935..9c647ae 100644
--- a/docs/varnish/vcl/varnish5.vcl
+++ b/docs/varnish/vcl/varnish5.vcl
@@ -18,7 +18,7 @@ include "parameters.vcl";
 sub vcl_recv {
 
     // Set the backend
-    set req.backend_hint = ezplatform;
+    set req.backend_hint = ibexa;
 
     // Add a Surrogate-Capability header to announce ESI support.
     set req.http.Surrogate-Capability = "abc=ESI/1.0";
diff --git a/docs/varnish/vcl/varnish6.vcl b/docs/varnish/vcl/varnish6.vcl
index d3f91ab..bb3c5ab 100644
--- a/docs/varnish/vcl/varnish6.vcl
+++ b/docs/varnish/vcl/varnish6.vcl
@@ -18,7 +18,7 @@ include "parameters.vcl";
 sub vcl_recv {
 
     // Set the backend
-    set req.backend_hint = ezplatform;
+    set req.backend_hint = ibexa;
 
     // Add a Surrogate-Capability header to announce ESI support.
     set req.http.Surrogate-Capability = "abc=ESI/1.0";
diff --git a/docs/varnish/vcl/varnish7.vcl b/docs/varnish/vcl/varnish7.vcl
index eafb9d7..ce5e5e7 100644
--- a/docs/varnish/vcl/varnish7.vcl
+++ b/docs/varnish/vcl/varnish7.vcl
@@ -16,7 +16,7 @@ include "/etc/varnish/parameters.vcl";
 sub vcl_recv {
 
     // Set the backend
-    set req.backend_hint = ezplatform;
+    set req.backend_hint = ibexa;
 
     // Add a Surrogate-Capability header to announce ESI support.
     set req.http.Surrogate-Capability = "abc=ESI/1.0";

From 80fb14a2ceb76624a76ab8420bc947b11f891276 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 12:03:24 +0200
Subject: [PATCH 2/5] =?UTF-8?q?*.vcl:=20ez=5Fpurge=20=E2=86=92=20ibexa=5Fp?=
 =?UTF-8?q?urge,=20ez=5Fpurge=5Facl=20=E2=86=92=20ibexa=5Fpurge=5Facl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/varnish/vcl/parameters.vcl |  2 +-
 docs/varnish/vcl/varnish5.vcl   | 10 +++++-----
 docs/varnish/vcl/varnish6.vcl   | 10 +++++-----
 docs/varnish/vcl/varnish7.vcl   | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/varnish/vcl/parameters.vcl b/docs/varnish/vcl/parameters.vcl
index e07e234..bee4751 100644
--- a/docs/varnish/vcl/parameters.vcl
+++ b/docs/varnish/vcl/parameters.vcl
@@ -15,7 +15,7 @@ backend ibexa {
 //      shared secret using env variable HTTPCACHE_VARNISH_INVALIDATE_TOKEN and Ibexa DXP will also use that for configuring this
 //      bundle. This is prefered for setups such as Ibexa Cloud, where circular service dependency is
 //      unwanted. If you use this, use a strong cryptological secure hash & make sure to keep the token secret.
-// Use ez_purge_acl for invalidation by token.
+// Use ibexa_purge_acl for invalidation by token.
 acl invalidators {
     "127.0.0.1";
     "192.168.0.0"/16;
diff --git a/docs/varnish/vcl/varnish5.vcl b/docs/varnish/vcl/varnish5.vcl
index 9c647ae..a9b2fa6 100644
--- a/docs/varnish/vcl/varnish5.vcl
+++ b/docs/varnish/vcl/varnish5.vcl
@@ -31,7 +31,7 @@ sub vcl_recv {
     }
 
     // Trigger cache purge if needed
-    call ez_purge;
+    call ibexa_purge;
 
     // Don't cache requests other than GET and HEAD.
     if (req.method != "GET" && req.method != "HEAD") {
@@ -142,13 +142,13 @@ sub vcl_backend_response {
 // Handle purge
 // You may add FOSHttpCacheBundle tagging rules
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
-sub ez_purge {
+sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
     call ez_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         # If neither of the headers are provided we return 400 to simplify detecting wrong configuration
         if (!req.http.xkey-purge && !req.http.xkey-softpurge) {
@@ -171,13 +171,13 @@ sub ez_purge {
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_purge.vcl
     if (req.method == "PURGE") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         return (purge);
     }
 }
 
-sub ez_purge_acl {
+sub ibexa_purge_acl {
     if (req.http.x-invalidate-token) {
         if (req.http.x-invalidate-token != req.http.x-backend-invalidate-token) {
             return (synth(405, "Method not allowed"));
diff --git a/docs/varnish/vcl/varnish6.vcl b/docs/varnish/vcl/varnish6.vcl
index bb3c5ab..9efa52c 100644
--- a/docs/varnish/vcl/varnish6.vcl
+++ b/docs/varnish/vcl/varnish6.vcl
@@ -31,7 +31,7 @@ sub vcl_recv {
     }
 
     // Trigger cache purge if needed
-    call ez_purge;
+    call ibexa_purge;
 
     // Don't cache requests other than GET and HEAD.
     if (req.method != "GET" && req.method != "HEAD") {
@@ -142,13 +142,13 @@ sub vcl_backend_response {
 // Handle purge
 // You may add FOSHttpCacheBundle tagging rules
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
-sub ez_purge {
+sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
     call ez_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         # If neither of the headers are provided we return 400 to simplify detecting wrong configuration
         if (!req.http.xkey-purge && !req.http.xkey-softpurge) {
@@ -171,13 +171,13 @@ sub ez_purge {
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_purge.vcl
     if (req.method == "PURGE") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         return (purge);
     }
 }
 
-sub ez_purge_acl {
+sub ibexa_purge_acl {
     if (req.http.x-invalidate-token) {
         if (req.http.x-invalidate-token != req.http.x-backend-invalidate-token) {
             return (synth(405, "Method not allowed"));
diff --git a/docs/varnish/vcl/varnish7.vcl b/docs/varnish/vcl/varnish7.vcl
index ce5e5e7..338779f 100644
--- a/docs/varnish/vcl/varnish7.vcl
+++ b/docs/varnish/vcl/varnish7.vcl
@@ -29,7 +29,7 @@ sub vcl_recv {
     }
 
     // Trigger cache purge if needed
-    call ez_purge;
+    call ibexa_purge;
 
     // Don't cache requests other than GET and HEAD.
     if (req.method != "GET" && req.method != "HEAD") {
@@ -117,13 +117,13 @@ sub vcl_backend_response {
 // Handle purge
 // You may add FOSHttpCacheBundle tagging rules
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
-sub ez_purge {
+sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
     call ez_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         # If neither of the headers are provided we return 400 to simplify detecting wrong configuration
         if (!req.http.xkey-purge && !req.http.xkey-softpurge) {
@@ -146,13 +146,13 @@ sub ez_purge {
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_purge.vcl
     if (req.method == "PURGE") {
-        call ez_purge_acl;
+        call ibexa_purge_acl;
 
         return (purge);
     }
 }
 
-sub ez_purge_acl {
+sub ibexa_purge_acl {
     if (req.http.x-invalidate-token) {
         if (req.http.x-invalidate-token != req.http.x-backend-invalidate-token) {
             return (synth(405, "Method not allowed"));

From 3f5f028e709273b279f4e445d9db667529dcf025 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 12:06:11 +0200
Subject: [PATCH 3/5] =?UTF-8?q?*.vcl:=20ez=5Fuser=5Fcontext=5Fhash=20?=
 =?UTF-8?q?=E2=86=92=20ibexa=5Fuser=5Fcontext=5Fhash,=20ez=5Finvalidate=5F?=
 =?UTF-8?q?token=20=E2=86=92=20ibexa=5Finvalidate=5Ftoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/varnish/vcl/varnish5.vcl | 8 ++++----
 docs/varnish/vcl/varnish6.vcl | 8 ++++----
 docs/varnish/vcl/varnish7.vcl | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/varnish/vcl/varnish5.vcl b/docs/varnish/vcl/varnish5.vcl
index a9b2fa6..871fe37 100644
--- a/docs/varnish/vcl/varnish5.vcl
+++ b/docs/varnish/vcl/varnish5.vcl
@@ -72,7 +72,7 @@ sub vcl_recv {
     set req.url = std.querysort(req.url);
 
     // Retrieve client user context hash and add it to the forwarded request.
-    call ez_user_context_hash;
+    call ibexa_user_context_hash;
 
     // If it passes all these tests, do a lookup anyway.
     return (hash);
@@ -144,7 +144,7 @@ sub vcl_backend_response {
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
 sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
-    call ez_invalidate_token;
+    call ibexa_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
@@ -188,7 +188,7 @@ sub ibexa_purge_acl {
 }
 
 // Sub-routine to get client user context hash, used to for being able to vary page cache on user rights.
-sub ez_user_context_hash {
+sub ibexa_user_context_hash {
 
     // Prevent tampering attacks on the hash mechanism
     if (req.restarts == 0
@@ -237,7 +237,7 @@ sub ez_user_context_hash {
 }
 
 // Sub-routine to get invalidate token.
-sub ez_invalidate_token {
+sub ibexa_invalidate_token {
     // Prevent tampering attacks on the token mechanisms
     if (req.restarts == 0
         && (req.http.accept ~ "application/vnd.ezplatform.invalidate-token"
diff --git a/docs/varnish/vcl/varnish6.vcl b/docs/varnish/vcl/varnish6.vcl
index 9efa52c..3fe4e16 100644
--- a/docs/varnish/vcl/varnish6.vcl
+++ b/docs/varnish/vcl/varnish6.vcl
@@ -72,7 +72,7 @@ sub vcl_recv {
     set req.url = std.querysort(req.url);
 
     // Retrieve client user context hash and add it to the forwarded request.
-    call ez_user_context_hash;
+    call ibexa_user_context_hash;
 
     // If it passes all these tests, do a lookup anyway.
     return (hash);
@@ -144,7 +144,7 @@ sub vcl_backend_response {
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
 sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
-    call ez_invalidate_token;
+    call ibexa_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
@@ -188,7 +188,7 @@ sub ibexa_purge_acl {
 }
 
 // Sub-routine to get client user context hash, used to for being able to vary page cache on user rights.
-sub ez_user_context_hash {
+sub ibexa_user_context_hash {
 
     // Prevent tampering attacks on the hash mechanism
     if (req.restarts == 0
@@ -237,7 +237,7 @@ sub ez_user_context_hash {
 }
 
 // Sub-routine to get invalidate token.
-sub ez_invalidate_token {
+sub ibexa_invalidate_token {
     // Prevent tampering attacks on the token mechanisms
     if (req.restarts == 0
         && (req.http.accept ~ "application/vnd.ezplatform.invalidate-token"
diff --git a/docs/varnish/vcl/varnish7.vcl b/docs/varnish/vcl/varnish7.vcl
index 338779f..a458f7f 100644
--- a/docs/varnish/vcl/varnish7.vcl
+++ b/docs/varnish/vcl/varnish7.vcl
@@ -70,7 +70,7 @@ sub vcl_recv {
     set req.url = std.querysort(req.url);
 
     // Retrieve client user context hash and add it to the forwarded request.
-    call ez_user_context_hash;
+    call ibexa_user_context_hash;
 
     // If it passes all these tests, do a lookup anyway.
     return (hash);
@@ -119,7 +119,7 @@ sub vcl_backend_response {
 // See http://foshttpcache.readthedocs.org/en/latest/varnish-configuration.html#id4
 sub ibexa_purge {
     // Retrieve purge token, needs to be here due to restart, match for PURGE method done within
-    call ez_invalidate_token;
+    call ibexa_invalidate_token;
 
     # Adapted with acl from vendor/friendsofsymfony/http-cache/resources/config/varnish/fos_tags_xkey.vcl
     if (req.method == "PURGEKEYS") {
@@ -163,7 +163,7 @@ sub ibexa_purge_acl {
 }
 
 // Sub-routine to get client user context hash, used to for being able to vary page cache on user rights.
-sub ez_user_context_hash {
+sub ibexa_user_context_hash {
 
     // Prevent tampering attacks on the hash mechanism
     if (req.restarts == 0
@@ -212,7 +212,7 @@ sub ez_user_context_hash {
 }
 
 // Sub-routine to get invalidate token.
-sub ez_invalidate_token {
+sub ibexa_invalidate_token {
     // Prevent tampering attacks on the token mechanisms
     if (req.restarts == 0
         && (req.http.accept ~ "application/vnd.ezplatform.invalidate-token"

From 5dd0b518356f0cb92c2f5c0194e856f2fdd7cd88 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 15:45:22 +0200
Subject: [PATCH 4/5] Change CI docker package version

https://github.com/ibexa/docker/pull/42/files
---
 dependencies.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 dependencies.json

diff --git a/dependencies.json b/dependencies.json
new file mode 100644
index 0000000..13b4c84
--- /dev/null
+++ b/dependencies.json
@@ -0,0 +1,11 @@
+{
+    "recipesEndpoint": "",
+    "packages": [
+        {
+            "requirement": "dev-http-cache-rebrand-to-ibexa as 5.0.x-dev",
+            "repositoryUrl": "https://github.com/ibexa/docker",
+            "package": "ibexa/docker",
+            "shouldBeAddedAsVCS": false
+        }
+    ]
+}

From 0c29e37719e765fea22ea8a1c481169da87e5e51 Mon Sep 17 00:00:00 2001
From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 15:55:26 +0200
Subject: [PATCH 5/5] Revert "Change CI docker package version"

This reverts commit 76e93989d08773a3835bc3a43742b86fe35557e3.
---
 dependencies.json | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 dependencies.json

diff --git a/dependencies.json b/dependencies.json
deleted file mode 100644
index 13b4c84..0000000
--- a/dependencies.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "recipesEndpoint": "",
-    "packages": [
-        {
-            "requirement": "dev-http-cache-rebrand-to-ibexa as 5.0.x-dev",
-            "repositoryUrl": "https://github.com/ibexa/docker",
-            "package": "ibexa/docker",
-            "shouldBeAddedAsVCS": false
-        }
-    ]
-}