Merge branch 'development' into 'master'

readded ssl redirect

See merge request !1561

.gitlab/production-values.yaml

@@ -11,7 +11,6 @@ podDisruptionBudget:
 ingress:
   annotations:
     certmanager.k8s.io/cluster-issuer: letsencrypt-prod
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/configuration-snippet: |
       if ($host = "www.metager.de") {
           return 301 https://metager.de$request_uri;
@@ -24,4 +23,4 @@ ingress:
       }
       if ($host = "klassik.metager.org") {
           return 301 https://metager.de$request_uri;
-      }
+      }
\ No newline at end of file