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
3ea63b355c
10
.env.sample
10
.env.sample
|
@ -17,6 +17,13 @@ SECRET_ADMIN_PASSWORD_VERSION=v1
|
|||
|
||||
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"
|
||||
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||
# SMTP_AUTHTYPE=
|
||||
|
@ -36,7 +43,6 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
|||
#
|
||||
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||
#
|
||||
#
|
||||
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||
# SECRET_BBB_SECRET_VERSION=v1
|
||||
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html
|
||||
|
||||
|
||||
|
||||
# Nextcloud
|
||||
|
||||
[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/nextcloud/status.svg)](https://drone.autonomic.zone/coop-cloud/nextcloud)
|
||||
|
@ -54,7 +58,7 @@ Solution:
|
|||
2. `abra app undeploy ...`, `abra volume rm`, CAREFULLY only choose the volume
|
||||
ENDING `_nextcloud`, then `abra app deploy --chaos ...`, then edit the
|
||||
`compose.yml` to add `entrypoint: ['tail', '-f', '/dev/null']` to `app`,
|
||||
then `app deploy --chaos` again, then `app run --user=www-data ... app bash` to get in and run `./occ maintenance:repair`, and `./occ upgrade`.
|
||||
then `app deploy --chaos` again, then `app run --user=www-data ... app bash` to get in and run `./occ maintenance:repair`, and `./occ upgrade`.
|
||||
- Change `compose.yml` to the new version number; `git checkout compose.yml`
|
||||
- `abra app deploy --force`
|
||||
- This wasn't even multiplle major versions was it 😾
|
||||
|
@ -183,7 +187,7 @@ containers](https://github.com/nextcloud/previewgenerator/issues/1). So, a
|
|||
pretty dodgy hack is to run it from the system directly:
|
||||
|
||||
```
|
||||
root@foo.com /etc/cron.hourly $ cat foo-com-preview-generate
|
||||
root@foo.com /etc/cron.hourly $ cat foo-com-preview-generate
|
||||
#!/bin/bash
|
||||
|
||||
docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-generate
|
||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
export FPM_TUNE_VERSION=v4
|
||||
export FPM_TUNE_VERSION=v5
|
||||
export NGINX_CONF_VERSION=v4
|
||||
export MY_CNF_VERSION=v4
|
||||
export ENTRYPOINT_VERSION=v3
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
pm = dynamic
|
||||
pm.max_children = 131
|
||||
pm.start_servers = 32
|
||||
pm.min_spare_servers = 32
|
||||
pm.max_spare_servers = 98
|
||||
pm.max_children = {{ env "FPM_MAX_CHILDREN" }}
|
||||
pm.start_servers = {{ env "FPM_START_SERVERS" }}
|
||||
pm.min_spare_servers = {{ env "FPM_MIN_SPARE_SERVERS" }}
|
||||
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:
|
||||
|
||||
```
|
||||
```
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||
# SMTP_AUTHTYPE=
|
||||
|
@ -13,6 +28,9 @@ Add SMTP Config to your .env file:
|
|||
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||
```
|
||||
|
||||
|
||||
## Post Deploy Commands
|
||||
|
||||
Some Apps can also be managed with abra app cmd!
|
||||
|
||||
```
|
||||
|
|
Loading…
Reference in New Issue