Merge branch 'master' into 'development'

Master

See merge request !1504

.gitlab-ci.yml

@@ -159,8 +159,8 @@ development:
 
 production:
   variables:
-    ADDITIONAL_HOSTS: "www.metager.es"
+    ADDITIONAL_HOSTS: "www.metager.de,metager.org,www.metager.org,metager.es,www.metager.es"
     HELM_UPGRADE_VALUES_FILE: .gitlab/production-values.yaml
     ROLLOUT_RESOURCE_TYPE: deployment
   environment:
-    url: https://metager.es
+    url: https://metager.de

.gitlab/production-values.yaml

 service:
   externalPort: 80
   internalPort: 80
+hpa:
+  minReplicas: 10
+  maxReplicas: 40
 ingress:
   annotations:
     certmanager.k8s.io/cluster-issuer: letsencrypt-prod

Dockerfile

@@ -17,6 +17,10 @@ RUN apt -y update && apt -y install php-fpm \
 
 RUN sed -i 's/listen.owner = www-data/listen.owner = nginx/g' /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i 's/listen.group = www-data/listen.group = nginx/g' /etc/php/7.3/fpm/pool.d/www.conf && \
+    sed -i 's/pm.max_children = 5/pm.max_children = 100/g' /etc/php/7.3/fpm/pool.d/www.conf && \
+    sed -i 's/pm.start_servers = 2/pm.start_servers = 25/g' /etc/php/7.3/fpm/pool.d/www.conf && \
+    sed -i 's/pm.min_spare_servers = 1/pm.min_spare_servers = 5/g' /etc/php/7.3/fpm/pool.d/www.conf && \
+    sed -i 's/pm.max_spare_servers = 3/pm.max_spare_servers = 25/g' /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i 's/user = www-data/user = nginx/g' /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i 's/group = www-data/group = nginx/g' /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/7.3/fpm/php.ini && \