feat: template fpm settings
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
this closes #25
This commit is contained in:
parent
9148747de6
commit
805b29d918
10
.env.sample
10
.env.sample
|
@ -17,6 +17,13 @@ SECRET_ADMIN_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
||||||
|
|
||||||
|
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||||
|
FPM_MAX_CHILDREN=131
|
||||||
|
FPM_START_SERVERS=32
|
||||||
|
FPM_MIN_SPARE_SERVERS=32
|
||||||
|
FPM_MAX_SPARE_SERVERS=98
|
||||||
|
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||||
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||||
# SMTP_AUTHTYPE=
|
# SMTP_AUTHTYPE=
|
||||||
|
@ -36,7 +43,6 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
||||||
#
|
#
|
||||||
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
#
|
#
|
||||||
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||||
# SECRET_BBB_SECRET_VERSION=v1
|
# SECRET_BBB_SECRET_VERSION=v1
|
||||||
|
|
||||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export FPM_TUNE_VERSION=v4
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v4
|
export NGINX_CONF_VERSION=v4
|
||||||
export MY_CNF_VERSION=v4
|
export MY_CNF_VERSION=v4
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
|
|
|
@ -61,6 +61,10 @@ services:
|
||||||
- REDIS_HOST=cache
|
- REDIS_HOST=cache
|
||||||
- OVERWRITEPROTOCOL=https
|
- OVERWRITEPROTOCOL=https
|
||||||
- PHP_MEMORY_LIMIT=1G
|
- PHP_MEMORY_LIMIT=1G
|
||||||
|
- FPM_MAX_CHILDREN=131
|
||||||
|
- FPM_START_SERVERS=32
|
||||||
|
- FPM_MIN_SPARE_SERVERS=32
|
||||||
|
- FPM_MAX_SPARE_SERVERS=98
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
@ -124,6 +128,7 @@ configs:
|
||||||
fpm_tune:
|
fpm_tune:
|
||||||
name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
|
name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
|
||||||
file: fpm-tune.ini
|
file: fpm-tune.ini
|
||||||
|
template_driver: golang
|
||||||
entrypoint:
|
entrypoint:
|
||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
pm = dynamic
|
pm = dynamic
|
||||||
pm.max_children = 131
|
pm.max_children = {{ env "FPM_MAX_CHILDREN" }}
|
||||||
pm.start_servers = 32
|
pm.start_servers = {{ env "FPM_START_SERVERS" }}
|
||||||
pm.min_spare_servers = 32
|
pm.min_spare_servers = {{ env "FPM_MIN_SPARE_SERVERS" }}
|
||||||
pm.max_spare_servers = 98
|
pm.max_spare_servers = {{ env "FPM_MAX_SPARE_SERVERS" }}
|
||||||
|
|
|
@ -1,6 +1,21 @@
|
||||||
|
|
||||||
|
## FPM Tune
|
||||||
|
|
||||||
|
The fpm-tune.ini settings are now configurable by `.env`. Please add this to your servers configs:
|
||||||
|
|
||||||
|
```
|
||||||
|
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||||
|
FPM_MAX_CHILDREN=131
|
||||||
|
FPM_START_SERVERS=32
|
||||||
|
FPM_MIN_SPARE_SERVERS=32
|
||||||
|
FPM_MAX_SPARE_SERVERS=98
|
||||||
|
```
|
||||||
|
|
||||||
|
## SMTP
|
||||||
|
|
||||||
Add SMTP Config to your .env file:
|
Add SMTP Config to your .env file:
|
||||||
|
|
||||||
```
|
```
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||||
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||||
# SMTP_AUTHTYPE=
|
# SMTP_AUTHTYPE=
|
||||||
|
@ -13,6 +28,9 @@ Add SMTP Config to your .env file:
|
||||||
# SECRET_SMTP_PASSWORD_VERSION=v1
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Post Deploy Commands
|
||||||
|
|
||||||
Some Apps can also be managed with abra app cmd!
|
Some Apps can also be managed with abra app cmd!
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
Loading…
Reference in New Issue