Merge branch 'development' into 'master'

Development

See merge request !1503

.gitlab-ci.yml

@@ -159,7 +159,8 @@ development:
 
 production:
   variables:
-    HELM_UPGRADE_EXTRA_ARGS: --set service.externalPort=80 --set service.internalPort=80 --set service.commonName= --set ingress.annotations.certmanager\.k8s\.io/cluster-issuer=letsencrypt-prod
+    ADDITIONAL_HOSTS: "www.metager.es"
+    HELM_UPGRADE_VALUES_FILE: .gitlab/production-values.yaml
     ROLLOUT_RESOURCE_TYPE: deployment
   environment:
-    url: https://metager.de
+    url: https://metager.es

.gitlab/production-values.yaml

+service:
+  externalPort: 80
+  internalPort: 80
+ingress:
+  annotations:
+    certmanager.k8s.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      if ($host = "www.metager.de") {
+          return 301 https://metager.de$request_uri;
+      }
+      if ($host = "www.metager.org") {
+          return 301 https://metager.org$request_uri;
+      }
+      if ($host = "www.metager.es") {
+          return 301 https://metager.es$request_uri;
+      }
\ No newline at end of file