Просмотр исходного кода

try to fix device reconnect issues

pull/514/head
benkuly 5 лет назад
Родитель
Сommit
2fd8216fbc
3 измененных файлов: 7 добавлений и 3 удалений
  1. +3
    -1
      docs/configuring-playbook-matrix-sms-bridge.md
  2. +2
    -1
      roles/matrix-sms-bridge/defaults/main.yml
  3. +2
    -1
      roles/matrix-sms-bridge/templates/systemd/matrix-sms-bridge.service.j2

+ 3
- 1
docs/configuring-playbook-matrix-sms-bridge.md Просмотреть файл

@@ -13,7 +13,7 @@ playbook configuration:


```yaml ```yaml
matrix_sms_bridge_enabled: true matrix_sms_bridge_enabled: true
matrix_sms_bridge_gammu_modem: "/path/to/modem"
matrix_sms_bridge_gammu_modem: "/dev/serial/by-id/myDeviceId"
# generate a secret passwort e.g. with pwgen -s 64 1 # generate a secret passwort e.g. with pwgen -s 64 1
matrix_sms_bridge_database_password: "" matrix_sms_bridge_database_password: ""
# (optional) a room id to a default room # (optional) a room id to a default room
@@ -22,6 +22,8 @@ matrix_sms_bridge_default_room: ""
matrix_sms_bridge_gammu_reset_frequency: 3600 matrix_sms_bridge_gammu_reset_frequency: 3600
# (optional) group with unix read and write rights to modem # (optional) group with unix read and write rights to modem
matrix_sms_bridge_modem_group: 'dialout' matrix_sms_bridge_modem_group: 'dialout'
# (optional) cgroup major number to allow access to devices, that gets reconnected (e.g. due to reset)
matrix_sms_bridge_cgroup_major_number: '188'
``` ```






+ 2
- 1
roles/matrix-sms-bridge/defaults/main.yml Просмотреть файл

@@ -48,6 +48,7 @@ matrix_sms_bridge_homserver_domain: "{{ matrix_domain }}"
matrix_sms_bridge_default_room: '' matrix_sms_bridge_default_room: ''


matrix_sms_bridge_gammu_modem: '' matrix_sms_bridge_gammu_modem: ''
matrix_sms_bridge_cgroup_major_number: '188'
matrix_sms_bridge_modem_group: 'dialout' matrix_sms_bridge_modem_group: 'dialout'
matrix_sms_bridge_gammu_reset_frequency: 0 matrix_sms_bridge_gammu_reset_frequency: 0


@@ -110,7 +111,7 @@ matrix_sms_bridge_configuration: "{{ matrix_sms_bridge_configuration_yaml|from_y


matrix_sms_bridge_gammu_configuration: | matrix_sms_bridge_gammu_configuration: |
[gammu] [gammu]
Device = /dev/ttyModem
Device = {{ matrix_sms_bridge_gammu_modem }}
LogFile = /data/log/gammu.log LogFile = /data/log/gammu.log
debugLevel = 1 debugLevel = 1




+ 2
- 1
roles/matrix-sms-bridge/templates/systemd/matrix-sms-bridge.service.j2 Просмотреть файл

@@ -29,7 +29,8 @@ ExecStart=/usr/bin/docker run --rm --name matrix-sms-bridge \
-v {{ matrix_sms_bridge_config_path }}:/config:z \ -v {{ matrix_sms_bridge_config_path }}:/config:z \
-v {{ matrix_sms_bridge_data_path }}:/data:z \ -v {{ matrix_sms_bridge_data_path }}:/data:z \
-v {{ matrix_sms_bridge_config_path }}/gammu-smsdrc:/etc/gammu-smsdrc:z \ -v {{ matrix_sms_bridge_config_path }}/gammu-smsdrc:/etc/gammu-smsdrc:z \
--device {{ matrix_sms_bridge_gammu_modem }}:/dev/ttyModem \
--device-cgroup-rule='c {{ matrix_sms_bridge_cgroup_major_number }}:* rmw' \
--device {{ matrix_sms_bridge_gammu_modem }}:{{ matrix_sms_bridge_gammu_modem }} \
{% for arg in matrix_sms_bridge_container_extra_arguments %} {% for arg in matrix_sms_bridge_container_extra_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}


Загрузка…
Отмена
Сохранить