Merge branch 'hotfix/v2.4.8'

roadiz · Jan 14, 2025 · bc20fa7 · bc20fa7
2 parents ebff160 + 4e818b8
commit bc20fa7
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 24 deletions.
diff --git a/.env b/.env
@@ -28,7 +28,9 @@ PUBLIC_VARNISH_PORT=8784
 PUBLIC_PMA_PORT=8782
 PUBLIC_DB_PORT=3306
 PUBLIC_REDIS_PORT=6379
+###> roadiz/solr ###
 PUBLIC_SOLR_PORT=8783
+###< roadiz/solr ###
 PUBLIC_MAILER_PORT=8725
 PUBLIC_SMTP_PORT=1025
 # Example Traefik local IP and
@@ -57,7 +59,9 @@ REDIRECT_REGEX=^(https?)://api\.roadiz\-skeleton\.test/(.*)
 REDIRECT_REPLACEMENT=$1://roadiz\-skeleton\.test/$2
 
 HOSTNAME_PMA=`^pma\.roadiz\-skeleton\.(test|local)$`
+###> roadiz/solr ###
 HOSTNAME_SOLR=`^solr\.roadiz\-skeleton\.(test|local)$`
+###< roadiz/solr ###
 HOSTNAME_MAILER=`^(mail|mailer)\.roadiz\-skeleton\.(test|local)$`
 
 ## Restic backup configuration
@@ -103,9 +107,11 @@ APP_VERSION=0.1.0
 APP_HEALTH_CHECK_TOKEN=
 APP_RECAPTCHA_PUBLIC_KEY=
 
+###> roadiz/solr ###
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_CORE_NAME=roadiz
+###< roadiz/solr ###
 
 VARNISH_HOST=varnish
 VARNISH_DOMAIN=varnish.roadiz-skeleton.test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to project will be documented in this file.
 
+## [2.4.8](https://github.com/roadiz/skeleton/compare/v2.4.7...v2.4.8) - 2025-01-14
+
+### Bug Fixes
+
+- Enable solr by default and added "roadiz/solr" tags to easily find configuration locations - ([0b8c3f1](https://github.com/roadiz/skeleton/commit/0b8c3f162f9cad45ee9a07e4de4588b966ed04fa)) - Ambroise Maupate
+
 ## [2.4.7](https://github.com/roadiz/skeleton/compare/v2.4.6...v2.4.7) - 2025-01-13
 
 ### Bug Fixes

diff --git a/compose.override.yml.dist b/compose.override.yml.dist
@@ -15,6 +15,9 @@ services:
     pma:
         ports:
             - ${PUBLIC_PMA_PORT}:80/tcp
+    solr:
+        ports:
+            - "${PUBLIC_SOLR_PORT}:8983/tcp"
 
     # If you depend on private Gitlab repositories, you must use a deploy token and username
     #app:
@@ -24,6 +27,3 @@ services:
     #            COMPOSER_DEPLOY_TOKEN: xxxxxxxxxxxxx
     #            COMPOSER_DEPLOY_TOKEN_USER: "gitlab+deploy-token-1"
 
-    #solr:
-    #    ports:
-    #        - "${PUBLIC_SOLR_PORT}:8983/tcp"
diff --git a/compose.prod.yml b/compose.prod.yml
@@ -142,16 +142,16 @@ services:
         entrypoint: 'docker-cron-entrypoint'
         user: root
 
-    #solr:
-    #    image: my-registry/roadiz_skeleton/solr:latest
-    #    volumes:
-    #        - "solr_data:/var/solr"
-    #    command:
-    #        - solr-precreate
-    #        - ${SOLR_CORE_NAME}
-    #    restart: always
-    #    networks:
-    #        - default
+    solr:
+        image: my-registry/roadiz_skeleton/solr:latest
+        volumes:
+            - "solr_data:/var/solr"
+        command:
+            - solr-precreate
+            - ${SOLR_CORE_NAME}
+        restart: always
+        networks:
+            - default
 
     # RESTIC incremental backup services
     restic:

diff --git a/config/packages/roadiz_core.yaml b/config/packages/roadiz_core.yaml
@@ -21,14 +21,16 @@ roadiz_core:
     inheritance:
         type: single_table
 
+###> roadiz/solr ###
     solr:
         timeout: 3
-        endpoints: {}
-#            docker:
-#                host: '%env(string:SOLR_HOST)%'
-#                core: '%env(string:SOLR_CORE_NAME)%'
-#                port: '%env(string:SOLR_PORT)%'
-#                path: /
+        endpoints:
+            docker:
+                host: '%env(string:SOLR_HOST)%'
+                core: '%env(string:SOLR_CORE_NAME)%'
+                port: '%env(string:SOLR_PORT)%'
+                path: /
+###< roadiz/solr ###
 
 
 when@prod:

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -31,10 +31,10 @@ target "api" {
                 name = "varnish"
                 target = "varnish"
             },
-            # {
-            #     name = "solr"
-            #     target = "solr"
-            # },
+            {
+                name = "solr"
+                target = "solr"
+            },
         ]
     }
     context = "."

diff --git a/docker/varnish/default.vcl b/docker/varnish/default.vcl
@@ -135,7 +135,7 @@ sub vcl_recv {
         if (client.ip ~ local) {
             if (req.http.ApiPlatform-Ban-Regex) {
                 ban("obj.http.Cache-Tags ~ " + req.http.ApiPlatform-Ban-Regex);
-                return (synth(200, "Ban added"));
+                return (synth(200, "Ban using cache-tags"));
             }
             elseif (req.http.X-Cache-Tags) {
                 ban("obj.http.X-Cache-Tags ~ " + req.http.X-Cache-Tags);