Merge branch 'develop' into trunk

manifest.yaml

@@ -120,10 +120,22 @@ spec:
           port: 80
       middlewares:
         - name: redirect-no-www-to-www
+        - name: redirect-ldc-rgpd-to-rgpd
   tls:
     secretName: ${CRT_TLS_NAME}
 
 ---
+# Redirect with domain replacement
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: redirect-ldc-rgpd-to-rgpd
+spec:
+  redirectRegex:
+    regex: ^https://${REDIRECT}${APP_DOMAIN}/rgpd/(professionnels|salaries|consommateurs)(/(en|de))?
+    replacement: https://rgpd.ldc.fr/fr/${1}
+    permanent: true
+---
 apiVersion: batch/v1
 kind: CronJob
 metadata:

production-resources.yaml

@@ -10,15 +10,4 @@ spec:
   secretName: $APP_DOMAIN
   issuerRef:
     name: $APP_CERT_ISSUER
-    kind: ClusterIssuer
----
-# Redirect with domain replacement
-apiVersion: traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: redirect-ldc-rgpd-to-rgpd
-spec:
-  redirectRegex:
-    regex: ^https://${REDIRECT}${APP_DOMAIN}/rgpd/(professionnels|salaries|consommateurs)(/(en|de))?
-    replacement: https://rgpd.ldc.fr/fr/${1}
-    permanent: true
+    kind: ClusterIssuer