Merge branch 'trunk'

composer.lock

@@ -968,16 +968,16 @@
         },
         {
             "name": "uwil/sbv-theme",
-            "version": "1.4.13",
+            "version": "1.4.14",
             "source": {
                 "type": "git",
                 "url": "git@lab.s-web.fr:ldc-web/projets/sbv-theme.git",
-                "reference": "141a74ac27d0f7480b5c1bec1f1e252ec1126e5e"
+                "reference": "9e04833f877d87576fa5cfd264571b5f4332d3ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=141a74ac27d0f7480b5c1bec1f1e252ec1126e5e",
-                "reference": "141a74ac27d0f7480b5c1bec1f1e252ec1126e5e",
+                "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=9e04833f877d87576fa5cfd264571b5f4332d3ef",
+                "reference": "9e04833f877d87576fa5cfd264571b5f4332d3ef",
                 "shasum": ""
             },
             "type": "wordpress-theme",

production-resources.yaml

@@ -19,7 +19,7 @@ metadata:
   name: redirect-multi-to-sbv
 spec:
   redirectRegex:
-    regex: ^https://(.*)(canardpassion|farmor|ronsard|procanar|volfrance)(.*)
+    regex: ^https://(.*)(canardpassion|farmor|ronsard|procanar)(.*)
     replacement: https://${REDIRECT}${APP_DOMAIN}
     permanent: true
 ---
@@ -31,7 +31,7 @@ spec:
   entryPoints:
   - websecure
   routes:
-  - match: (Host(`canardpassion.fr`) || Host(`www.canardpassion.fr`) || Host(`farmor.fr`) || Host(`www.farmor.fr`) || Host(`ronsard.fr`) || Host(`www.ronsard.fr`) || Host(`ronsard.com`) || Host(`www.ronsard.com`) || Host(`procanar.fr`) || Host(`www.procanar.fr`) || Host(`volfrance.fr`) || Host(`www.volfrance.fr`)) && !PathPrefix(`/.well-known/acme-challenge/`)
+  - match: (Host(`canardpassion.fr`) || Host(`www.canardpassion.fr`) || Host(`farmor.fr`) || Host(`www.farmor.fr`) || Host(`ronsard.fr`) || Host(`www.ronsard.fr`) || Host(`ronsard.com`) || Host(`www.ronsard.com`) || Host(`procanar.fr`) || Host(`www.procanar.fr`) && !PathPrefix(`/.well-known/acme-challenge/`)
     kind: Rule
     services:
     - name: api@internal
@@ -57,8 +57,6 @@ spec:
   - www.ronsard.com
   - procanar.fr
   - www.procanar.fr
-  - volfrance.fr
-  - www.volfrance.fr
   secretName: redirect-multi-to-sbv
   issuerRef:
     name: $APP_CERT_ISSUER