Merge pull request 'Add configuration option for maximum note length' (#8) from wolcen/hedgedoc:main into main
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
Reviewed-on: #8
This commit is contained in:
commit
b43724ecba
|
@ -41,3 +41,5 @@ COMPOSE_FILE="compose.yml"
|
||||||
# CMD_DEFAULT_PERMISSION=editable
|
# CMD_DEFAULT_PERMISSION=editable
|
||||||
# CMD_EMAIL=true
|
# CMD_EMAIL=true
|
||||||
# CMD_SESSION_LIFE=1209600000
|
# CMD_SESSION_LIFE=1209600000
|
||||||
|
# Only present in config.json (no equivalent env var):
|
||||||
|
# DOCUMENT_MAX_LENGTH=100000
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
abra app YOURAPPDOMAIN run app bash
|
abra app YOURAPPDOMAIN run app bash
|
||||||
. /docker-entrypoint2.sh -e
|
. /docker-entrypoint2.sh -e
|
||||||
bin/manage_users
|
bin/manage_users
|
||||||
```
|
|
||||||
|
|
||||||
[hedegedoc]: https://github.com/hackmdio/hedegedoc
|
[hedegedoc]: https://github.com/hedgedoc/hedgedoc
|
||||||
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
||||||
[compose-traefik]: https://git.autonomic.zone/coop-cloud/traefik
|
[compose-traefik]: https://git.autonomic.zone/coop-cloud/traefik
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
||||||
export ENTRYPOINT_CONF_VERSION=v5
|
export ENTRYPOINT_CONF_VERSION=v6
|
||||||
|
|
||||||
abra_backup_app() {
|
abra_backup_app() {
|
||||||
_abra_backup_dir "app:/home/hackmd/app/public/uploads/"
|
_abra_backup_dir "app:/home/hackmd/app/public/uploads/"
|
||||||
|
|
|
@ -26,6 +26,7 @@ services:
|
||||||
- CMD_DEFAULT_PERMISSION
|
- CMD_DEFAULT_PERMISSION
|
||||||
- CMD_EMAIL
|
- CMD_EMAIL
|
||||||
- CMD_SESSION_LIFE
|
- CMD_SESSION_LIFE
|
||||||
|
- DOCUMENT_MAX_LENGTH
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
networks:
|
networks:
|
||||||
|
@ -40,6 +41,9 @@ services:
|
||||||
- source: entrypoint_conf
|
- source: entrypoint_conf
|
||||||
target: /docker-entrypoint.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
- source: config_json
|
||||||
|
target: /files/config.json
|
||||||
|
mode: 0555
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
@ -90,6 +94,10 @@ networks:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
configs:
|
configs:
|
||||||
|
config_json:
|
||||||
|
name: ${STACK_NAME}_config_${ENTRYPOINT_CONF_VERSION}
|
||||||
|
file: config.json.tmpl
|
||||||
|
template_driver: golang
|
||||||
entrypoint_conf:
|
entrypoint_conf:
|
||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
{{ if (env "DOCUMENT_MAX_LENGTH") }}
|
||||||
|
"production": {
|
||||||
|
"documentMaxLength": {{ env "DOCUMENT_MAX_LENGTH" }}
|
||||||
|
}
|
||||||
|
{{ end }}
|
||||||
|
}
|
Loading…
Reference in New Issue