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

fixed typo in truststore path

pull/730/head
benkuly 5 лет назад
Родитель
Сommit
2fb42dd7f1
3 измененных файлов: 4 добавлений и 4 удалений
  1. +1
    -1
      docs/configuring-playbook-bridge-matrix-bridge-sms.md
  2. +1
    -1
      roles/matrix-bridge-sms/defaults/main.yml
  3. +2
    -2
      roles/matrix-bridge-sms/tasks/setup_install.yml

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

@@ -25,7 +25,7 @@ matrix_sms_bridge_provider_android_baseurl: https://192.168.24.24:9090
matrix_sms_bridge_provider_android_username: admin
matrix_sms_bridge_provider_android_password: supeSecretPassword

# (optional) ff your android-sms-gateway-server uses a self signed vertificate, the bridge needs a "truststore". This can be the certificate itself.
# (optional) if your android-sms-gateway-server uses a self signed vertificate, the bridge needs a "truststore". This can be the certificate itself.
matrix_sms_bridge_provider_android_truststore_local_path: android-sms-gateway-server.p12
matrix_sms_bridge_provider_android_truststore_password: 123



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

@@ -64,7 +64,7 @@ matrix_sms_bridge_configuration_yaml: |
# The password of the gateway
password: {{ matrix_sms_bridge_provider_android_password }}
# (optional) if you use a self signed certificate, you can add the public key here
{% if matrix_sms_bridge_provider_android_truststore_path %}
{% if matrix_sms_bridge_provider_android_truststore_local_path %}
trustStore:
path: /data/config/matrix-sms-gateway-server.p12
password: {{ matrix_sms_bridge_provider_android_truststore_password }}


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

@@ -35,12 +35,12 @@

- name: Ensure android-sms-gateway-server cert installed
copy:
src: "{{ matrix_sms_bridge_provider_android_truststore_path }}"
src: "{{ matrix_sms_bridge_provider_android_truststore_local_path }}"
dest: "{{ matrix_sms_bridge_config_path }}/matrix-sms-gateway-server.p12"
mode: 0644
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: matrix_sms_bridge_provider_android_truststore_path != ""
when: matrix_sms_bridge_provider_android_truststore_local_path != ""

- name: Ensure matrix-sms-bridge.service installed
template:


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