finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove mention of sqlite3 support for Etherpad

Browse Source 
The official Etherpad Docker image has no support for sqlite3 databases.
This commit is contained in:
Béla Becker 2021-02-18 17:39:36 +01:00
parent ef45b60e32
commit 005f4d57f9
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/matrix_servers
View File

@ -774,8 +774,6 @@ matrix_etherpad_systemd_required_services_list: |
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
}} }}
# Postgres is the default, except if not using `matrix_postgres` (internal postgres)
matrix_etherpad_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
matrix_etherpad_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'etherpad.db') | to_uuid }}" matrix_etherpad_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'etherpad.db') | to_uuid }}"
###################################################################### ######################################################################

11
roles/matrix-etherpad/defaults/main.yml
View File

@ -36,15 +36,8 @@ matrix_etherpad_base_url: "https://{{ matrix_server_fqn_dimension }}{{ matrix_et
# Database-related configuration fields. # Database-related configuration fields.
# #
# Etherpad recommends using a dedicated database, and supports Sqlite only for development # Etherpad requires a dedicated database
# matrix_etherpad_database_engine: 'postgres'
# To use Postgres:
# - change the engine (`matrix_etherpad_database_engine: 'postgres'`)
# - adjust your database credentials via the `matrix_etherpad_postgres_*` variables
matrix_etherpad_database_engine: 'sqlite'
matrix_etherpad_sqlite_database_path_local: "{{ matrix_etherpad_base_path }}/etherpad.db"
matrix_etherpad_sqlite_database_path_in_container: "/data/etherpad.db"
matrix_etherpad_database_username: 'matrix_etherpad' matrix_etherpad_database_username: 'matrix_etherpad'
matrix_etherpad_database_password: 'some-password' matrix_etherpad_database_password: 'some-password'

14
roles/matrix-etherpad/templates/settings.json.j2
View File

@ -8,15 +8,11 @@
"showSettingsInAdminPage": true, "showSettingsInAdminPage": true,
"dbType": {{ matrix_etherpad_database_engine|to_json }}, "dbType": {{ matrix_etherpad_database_engine|to_json }},
"dbSettings": { "dbSettings": {
{% if matrix_etherpad_database_engine == 'sqlite' %} "database": {{ matrix_etherpad_database_name|to_json }},
"filename": {{ matrix_etherpad_sqlite_database_path_in_container|to_json }} "host": {{ matrix_etherpad_database_hostname|to_json }},
{% elif matrix_etherpad_database_engine == 'postgres' %} "password": {{ matrix_etherpad_database_password|to_json }},
"database": {{ matrix_etherpad_database_name|to_json }}, "port": {{ matrix_etherpad_database_port|to_json }},
"host": {{ matrix_etherpad_database_hostname|to_json }}, "user": {{ matrix_etherpad_database_username|to_json }}
"password": {{ matrix_etherpad_database_password|to_json }},
"port": {{ matrix_etherpad_database_port|to_json }},
"user": {{ matrix_etherpad_database_username|to_json }}
{% endif %}
}, },
"defaultPadText" : {{ matrix_etherpad_default_pad_text|to_json }}, "defaultPadText" : {{ matrix_etherpad_default_pad_text|to_json }},
"suppressErrorsInPadText": false, "suppressErrorsInPadText": false,

5
roles/matrix-etherpad/templates/systemd/matrix-etherpad.service.j2
View File

@ -16,11 +16,6 @@ Environment="HOME={{ matrix_systemd_unit_home_path }}"
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-etherpad ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-etherpad
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-etherpad ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-etherpad
# Fixup database ownership if it got changed somehow (during a server migration, etc.)
{% if matrix_etherpad_database_engine == 'sqlite' %}
ExecStartPre=-{{ matrix_host_command_chown }} {{ matrix_etherpad_user_uid }} {{ matrix_etherpad_sqlite_database_path_local }}
{% endif %}
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-etherpad \ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-etherpad \
--log-driver=none \ --log-driver=none \
--user={{ matrix_etherpad_user_uid }}:{{ matrix_etherpad_user_gid }} \ --user={{ matrix_etherpad_user_uid }}:{{ matrix_etherpad_user_gid }} \