Merge branch 'develop' into 'master'

Develop

See merge request isard/isard-apps!26
Josep Maria Viñolas Auquer 2021-09-14 18:54:55 +00:00
commit d4b125c5ec
1 changed files with 2 additions and 2 deletions

View File

@ -22,8 +22,8 @@ services:
environment: environment:
ETHERPAD_TITLE: Title ETHERPAD_TITLE: Title
ETHERPAD_PORT: 9001 ETHERPAD_PORT: 9001
ETHERPAD_ADMIN_PASSWORD: ${ETHERPAD_ADMIN_PASSWORD} ETHERPAD_ADMIN_PASSWORD: ${ADMINAPP_PASSWORD}
ETHERPAD_ADMIN_USER: ${ETHERPAD_ADMIN_USER} ETHERPAD_ADMIN_USER: ${ADMINAPP_USER}
ETHERPAD_PLUGINS: ep_headings2,ep_adminpads2,ep_comments_page,ep_embedded_hyperlinks2,ep_font_color,ep_table_of_contents ETHERPAD_PLUGINS: ep_headings2,ep_adminpads2,ep_comments_page,ep_embedded_hyperlinks2,ep_font_color,ep_table_of_contents
ETHERPAD_MAXAGE: 3600 ETHERPAD_MAXAGE: 3600
ETHERPAD_DB_USER: ${ETHERPAD_POSTGRES_USER} ETHERPAD_DB_USER: ${ETHERPAD_POSTGRES_USER}