Commit 7f7ce949 authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Merge branch 'etherpad-postgres' into 'master'

Support db_type postgres for etherpad

See merge request !22
parents 8a16d4be 730cfbae
Pipeline #3163 passed with stage
in 1 minute and 27 seconds
......@@ -16,10 +16,14 @@
"dbSettings": {
"user": "{{item.db_user}}",
"host": "localhost",
"port": 3306,
"password": "{{item.db_password}}",
"database": "{{item.name}}",
"database": "{{item.db_name}}",
{% if item.db_type == "mysql" %}
"port": {{item.db_port|default(3306)}},
"charset": "utf8mb4"
{% elif item.db_type == "postgres" %}
"port": {{item.db_port|default(5432)}}
{% endif %}
},
"defaultPadText" : "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https:\/\/etherpad.org\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment