diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86661883c97ab515c2fab46ca08c102dba493f18..ab96ed6280fd2835dca8ef836d47e8c39030a6c7 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.gitlab/production-values.yaml b/.gitlab/production-values.yaml index 500ed0aa53b98dece486905f170513a194487dfe..7c5161ff17fb608ffce6be5d6b02a09673b8c66c 100644 --- a/.gitlab/production-values.yaml +++ b/.gitlab/production-values.yaml @@ -1,6 +1,9 @@ service: externalPort: 80 internalPort: 80 +hpa: + minReplicas: 10 + maxReplicas: 40 ingress: annotations: certmanager.k8s.io/cluster-issuer: letsencrypt-prod diff --git a/Dockerfile b/Dockerfile index 4604cc1b2b65ee41c64db555d613d56b146f57eb..98d2f4094275c7aa1c3d8653c7d64709bb91686e 100644 --- a/Dockerfile +++ b/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 && \