Make mautrix-telegram run as non-root and w/o capabilities
This commit is contained in:
parent
3e8a4159e6
commit
8a3f942d93
@ -14,8 +14,10 @@
|
|||||||
group: "{{ matrix_user_username }}"
|
group: "{{ matrix_user_username }}"
|
||||||
when: "matrix_mautrix_telegram_enabled"
|
when: "matrix_mautrix_telegram_enabled"
|
||||||
|
|
||||||
- stat: "path={{ matrix_mautrix_telegram_base_path }}/config.yaml"
|
- name: Check if a mautrix-telegram configuration file exists
|
||||||
register: mautrix_config_file
|
stat:
|
||||||
|
path: "{{ matrix_mautrix_telegram_base_path }}/config.yaml"
|
||||||
|
register: mautrix_config_file_stat
|
||||||
|
|
||||||
- name: Ensure Matrix Mautrix telegram config installed
|
- name: Ensure Matrix Mautrix telegram config installed
|
||||||
template:
|
template:
|
||||||
@ -24,7 +26,18 @@
|
|||||||
mode: 0644
|
mode: 0644
|
||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_username }}"
|
group: "{{ matrix_user_username }}"
|
||||||
when: "matrix_mautrix_telegram_enabled and mautrix_config_file.stat.exists == False"
|
when: "matrix_mautrix_telegram_enabled and not mautrix_config_file_stat.stat.exists"
|
||||||
|
|
||||||
|
- name: (Migration) Fix up old configuration
|
||||||
|
lineinfile:
|
||||||
|
path: "{{ matrix_mautrix_telegram_base_path }}/config.yaml"
|
||||||
|
regexp: "{{ item.regexp }}"
|
||||||
|
line: "{{ item.line }}"
|
||||||
|
backrefs: yes
|
||||||
|
with_items:
|
||||||
|
- {'regexp': '^(\s+)filename: \./mautrix-telegram.log', 'line': '\1filename: /data/mautrix-telegram.log'}
|
||||||
|
- {'regexp': '^(\s+)database:', 'line': '\1database: sqlite:////data/mautrix-telegram.db'}
|
||||||
|
when: "matrix_mautrix_telegram_enabled and mautrix_config_file_stat.stat.exists"
|
||||||
|
|
||||||
- name: Ensure matrix-mautrix-telegram.service installed
|
- name: Ensure matrix-mautrix-telegram.service installed
|
||||||
template:
|
template:
|
||||||
@ -33,13 +46,23 @@
|
|||||||
mode: 0644
|
mode: 0644
|
||||||
when: "matrix_mautrix_telegram_enabled"
|
when: "matrix_mautrix_telegram_enabled"
|
||||||
|
|
||||||
- stat:
|
- name: Check if a mautrix-telegram registration file exists
|
||||||
|
stat:
|
||||||
path: "{{ matrix_mautrix_telegram_base_path }}/registration.yaml"
|
path: "{{ matrix_mautrix_telegram_base_path }}/registration.yaml"
|
||||||
register: mautrix_telegram_registration_file
|
register: mautrix_telegram_registration_file_stat
|
||||||
|
|
||||||
- name: Generate matrix-mautrix-telegram registration.yaml if it doesn't exist
|
- name: Generate matrix-mautrix-telegram registration.yaml if it doesn't exist
|
||||||
shell: /usr/bin/docker run --rm --name matrix-mautrix-telegram-gen -v {{ matrix_mautrix_telegram_base_path }}:/data:z {{ matrix_mautrix_telegram_docker_image }} python3 -m mautrix_telegram -g -c /data/config.yaml -r /data/registration.yaml
|
shell:
|
||||||
when: "matrix_mautrix_telegram_enabled and mautrix_telegram_registration_file.stat.exists == False"
|
cmd: >-
|
||||||
|
/usr/bin/docker run
|
||||||
|
--rm
|
||||||
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
|
--cap-drop=ALL
|
||||||
|
--name matrix-mautrix-telegram-gen
|
||||||
|
-v {{ matrix_mautrix_telegram_base_path }}:/data:z
|
||||||
|
{{ matrix_mautrix_telegram_docker_image }}
|
||||||
|
python3 -m mautrix_telegram -g -c /data/config.yaml -r /data/registration.yaml
|
||||||
|
when: "matrix_mautrix_telegram_enabled and not mautrix_telegram_registration_file_stat.stat.exists"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml'
|
matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml'
|
||||||
|
@ -26,7 +26,7 @@ appservice:
|
|||||||
# Format examples:
|
# Format examples:
|
||||||
# SQLite: sqlite:///filename.db
|
# SQLite: sqlite:///filename.db
|
||||||
# Postgres: postgres://username:password@hostname/dbname
|
# Postgres: postgres://username:password@hostname/dbname
|
||||||
database: sqlite:///mautrix-telegram.db
|
database: sqlite:////data/mautrix-telegram.db
|
||||||
|
|
||||||
# Public part of web server for out-of-Matrix interaction with the bridge.
|
# Public part of web server for out-of-Matrix interaction with the bridge.
|
||||||
# Used for things like login if the user wants to make sure the 2FA password isn't stored in
|
# Used for things like login if the user wants to make sure the 2FA password isn't stored in
|
||||||
@ -253,7 +253,7 @@ logging:
|
|||||||
file:
|
file:
|
||||||
class: logging.handlers.RotatingFileHandler
|
class: logging.handlers.RotatingFileHandler
|
||||||
formatter: precise
|
formatter: precise
|
||||||
filename: ./mautrix-telegram.log
|
filename: /data/mautrix-telegram.log
|
||||||
maxBytes: 10485760
|
maxBytes: 10485760
|
||||||
backupCount: 10
|
backupCount: 10
|
||||||
console:
|
console:
|
||||||
|
@ -9,12 +9,21 @@ After=matrix-synapse.service
|
|||||||
Type=simple
|
Type=simple
|
||||||
ExecStartPre=-/usr/bin/docker kill matrix-mautrix-telegram
|
ExecStartPre=-/usr/bin/docker kill matrix-mautrix-telegram
|
||||||
ExecStartPre=-/usr/bin/docker rm matrix-mautrix-telegram
|
ExecStartPre=-/usr/bin/docker rm matrix-mautrix-telegram
|
||||||
|
ExecStartPre=/usr/bin/docker run --rm --name matrix-mautrix-telegram-db \
|
||||||
|
--log-driver=none \
|
||||||
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||||
|
--cap-drop=ALL \
|
||||||
|
-v {{ matrix_mautrix_telegram_base_path }}:/data:z \
|
||||||
|
{{ matrix_mautrix_telegram_docker_image }} \
|
||||||
|
alembic -x config=/data/config.yaml upgrade head
|
||||||
ExecStart=/usr/bin/docker run --rm --name matrix-mautrix-telegram \
|
ExecStart=/usr/bin/docker run --rm --name matrix-mautrix-telegram \
|
||||||
--log-driver=none \
|
--log-driver=none \
|
||||||
-e "UID={{ matrix_user_uid }}" -e "GID={{ matrix_user_gid }}" \
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||||
|
--cap-drop=ALL \
|
||||||
--network={{ matrix_docker_network }} \
|
--network={{ matrix_docker_network }} \
|
||||||
-v {{ matrix_mautrix_telegram_base_path }}:/data:z \
|
-v {{ matrix_mautrix_telegram_base_path }}:/data:z \
|
||||||
{{ matrix_mautrix_telegram_docker_image }}
|
{{ matrix_mautrix_telegram_docker_image }} \
|
||||||
|
python3 -m mautrix_telegram -c /data/config.yaml
|
||||||
ExecStop=-/usr/bin/docker kill matrix-mautrix-telegram
|
ExecStop=-/usr/bin/docker kill matrix-mautrix-telegram
|
||||||
ExecStop=-/usr/bin/docker rm matrix-mautrix-telegram
|
ExecStop=-/usr/bin/docker rm matrix-mautrix-telegram
|
||||||
Restart=always
|
Restart=always
|
||||||
|
Loading…
Reference in New Issue
Block a user