Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
b05b9fa9
Commit
b05b9fa9
authored
Feb 05, 2020
by
Dominik Hebeler
Browse files
Merge branch 'master' into 'development'
Master See merge request
!1504
parents
cfdde2f1
8fa7b9e2
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
b05b9fa9
...
...
@@ -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.e
s
url
:
https://metager.
d
e
.gitlab/production-values.yaml
View file @
b05b9fa9
service
:
externalPort
:
80
internalPort
:
80
hpa
:
minReplicas
:
10
maxReplicas
:
40
ingress
:
annotations
:
certmanager.k8s.io/cluster-issuer
:
letsencrypt-prod
...
...
Dockerfile
View file @
b05b9fa9
...
...
@@ -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
&&
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment