mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-24 18:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

matri-sms-bridge:

Browse Source 
better path handling, fixed some mistakes
This commit is contained in:
benkuly 2020-05-22 13:59:38 +02:00
parent 2d75fca257
commit 4913ca4bb2
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
roles/matrix-sms-bridge/defaults/main.yml
View File

@ -11,6 +11,7 @@ matrix_sms_bridge_database_docker_image_force_pull: "{{ matrix_sms_bridge_docker
matrix_sms_bridge_base_path: "{{ matrix_base_data_path }}/matrix-sms-bridge" matrix_sms_bridge_base_path: "{{ matrix_base_data_path }}/matrix-sms-bridge"
matrix_sms_bridge_config_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/config" matrix_sms_bridge_config_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/config"
matrix_sms_bridge_data_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data" matrix_sms_bridge_data_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data"
matrix_sms_bridge_data_log_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/log"
matrix_sms_bridge_data_spool_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool" matrix_sms_bridge_data_spool_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool"
matrix_sms_bridge_data_spool_inbox_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool/inbox" matrix_sms_bridge_data_spool_inbox_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool/inbox"
matrix_sms_bridge_data_spool_inbox_processed_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool/inbox_processed" matrix_sms_bridge_data_spool_inbox_processed_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/data/spool/inbox_processed"
@ -82,10 +83,10 @@ matrix_sms_bridge_configuration_yaml: |
gammu: gammu:
# (optional) default is disabled # (optional) default is disabled
enabled: true enabled: true
# (optional) Path to the Gammu-Inbox directory. Default is "/var/spool/gammu/inbox". # (optional) Path to the Gammu-Inbox directory.
inboxPath: "{{ matrix_sms_bridge_data_path }}/spool/inbox" inboxPath: "{{ matrix_sms_bridge_data_spool_inbox_path }}"
# (optional) Path to the directory, where to put processed messages. Default is "/var/spool/gammu/inbox_processed". # (optional) Path to the directory, where to put processed messages.
inboxProcessedPath: "{{ matrix_sms_bridge_data_path }}/spool/inbox_processed" inboxProcessedPath: "{{ matrix_sms_bridge_data_spool_inbox_path_processed }}"
bot: bot:
# The domain-part of matrix-ids. E. g. example.org when your userIds look like @unicorn:example.org # The domain-part of matrix-ids. E. g. example.org when your userIds look like @unicorn:example.org
serverName: {{ matrix_sms_bridge_homserver_domain }} serverName: {{ matrix_sms_bridge_homserver_domain }}
@ -117,21 +118,21 @@ matrix_sms_bridge_configuration_extension: "{{ matrix_sms_bridge_configuration_e
matrix_sms_bridge_gammu_configuration: | matrix_sms_bridge_gammu_configuration: |
[gammu] [gammu]
Device = /dev/ttyModem Device = /dev/ttyModem
LogFile = {{ matrix_sms_bridge_data_path }}/log/gammu.log LogFile = {{ matrix_sms_bridge_data_log_path }}/gammu.log
debugLevel = 1 debugLevel = 1
[smsd] [smsd]
Service = files Service = files
LoopSleep = 2 LoopSleep = 2
InboxPath = {{ matrix_sms_bridge_data_path }}/spool/inbox/ InboxPath = {{ matrix_sms_bridge_data_spool_inbox_path }}
OutboxPath = {{ matrix_sms_bridge_data_path }}/spool/outbox/ OutboxPath = {{ matrix_sms_bridge_data_spool_outbox_path }}
SentSMSPath = {{ matrix_sms_bridge_data_path }}/spool/sent/ SentSMSPath = {{ matrix_sms_bridge_data_spool_sent_path }}
ErrorSMSPath = {{ matrix_sms_bridge_data_path }}/spool/error/ ErrorSMSPath = {{ matrix_sms_bridge_data_spool_error_path }}
InboxFormat = detail InboxFormat = detail
OutboxFormat = detail OutboxFormat = detail
TransmitFormat = auto TransmitFormat = auto
debugLevel = 1 debugLevel = 1
LogFile = {{ matrix_sms_bridge_data_path }}/log/smsd.log LogFile = {{ matrix_sms_bridge_data_log_path }}/smsd.log
DeliveryReport = log DeliveryReport = log
DeliveryReportDelay = 7200 DeliveryReportDelay = 7200
HangupCalls = 1 HangupCalls = 1

2
roles/matrix-sms-bridge/tasks/init.yml
View File

@ -7,7 +7,7 @@
when: "matrix_sms_bridge_enabled and matrix_synapse_role_executed|default(False)" when: "matrix_sms_bridge_enabled and matrix_synapse_role_executed|default(False)"
- set_fact: - set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-sms-bridge','matrix-sms-bridge-database'] }}" matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-sms-bridge'] }}"
when: matrix_sms_bridge_enabled|bool when: matrix_sms_bridge_enabled|bool
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.

1
roles/matrix-sms-bridge/tasks/setup_install.yml
View File

@ -26,6 +26,7 @@
- "{{ matrix_sms_bridge_base_path }}" - "{{ matrix_sms_bridge_base_path }}"
- "{{ matrix_sms_bridge_config_path }}" - "{{ matrix_sms_bridge_config_path }}"
- "{{ matrix_sms_bridge_data_path }}" - "{{ matrix_sms_bridge_data_path }}"
- "{{ matrix_sms_bridge_data_log_path }}"
- "{{ matrix_sms_bridge_data_spool_path }}" - "{{ matrix_sms_bridge_data_spool_path }}"
- "{{ matrix_sms_bridge_data_spool_inbox_path }}" - "{{ matrix_sms_bridge_data_spool_inbox_path }}"
- "{{ matrix_sms_bridge_data_spool_inbox_processed_path }}" - "{{ matrix_sms_bridge_data_spool_inbox_processed_path }}"