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

Rename vars to make usage clear

pull/1771/head
Julian-Samuel Gebühr 3 лет назад
Родитель
Сommit
b8903d5cae
3 измененных файлов: 14 добавлений и 6 удалений
  1. +11
    -4
      roles/matrix-bot-matrix-registration-bot/defaults/main.yml
  2. +1
    -0
      roles/matrix-bot-matrix-registration-bot/tasks/validate_config.yml
  3. +2
    -2
      roles/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2

+ 11
- 4
roles/matrix-bot-matrix-registration-bot/defaults/main.yml Просмотреть файл

@@ -17,7 +17,17 @@ matrix_bot_matrix_registration_bot_data_path: "{{ matrix_bot_matrix_registration


matrix_bot_matrix_registration_bot_bot_server: "https://{{ matrix_server_fqn_matrix }}" matrix_bot_matrix_registration_bot_bot_server: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_matrix_registration_bot_api_base_url: "https://{{ matrix_server_fqn_matrix }}" matrix_bot_matrix_registration_bot_api_base_url: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_matrix_registration_bot_matrix_admin_token: "{{ matrix_bot_matrix_registration_bot_api_token }}"

# The access token that the bot uses to communicate in Matrix chats
# This does not necessarily need to be a privileged (admin) access token.
matrix_bot_matrix_registration_bot_bot_access_token: ''

# The access token that the bot uses to call the Matrix API for creating registration tokens.
# This needs to be a privileged (admin) access token.
# By default, we assume `matrix_bot_matrix_registration_bot_bot_access_token` is such a privileged token and we use it as is.
# If necessary, you can define your own other access token here, which might even be for a different Matrix user.
matrix_bot_matrix_registration_bot_api_token: "{{ matrix_bot_matrix_registration_bot_bot_access_token }}"

matrix_bot_matrix_registration_bot_logging_level: info matrix_bot_matrix_registration_bot_logging_level: info
matrix_bot_matrix_registration_environment_variables_extension: '' matrix_bot_matrix_registration_environment_variables_extension: ''


@@ -36,7 +46,4 @@ matrix_bot_matrix_registration_bot_matrix_user_id_localpart: "bot.matrix-registr


matrix_bot_matrix_registration_bot_matrix_user_id: '@{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}:{{ matrix_domain }}' matrix_bot_matrix_registration_bot_matrix_user_id: '@{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}:{{ matrix_domain }}'


# The password that the bot uses to authenticate.
matrix_bot_matrix_registration_bot_matrix_user_password: ''

matrix_bot_matrix_registration_bot_matrix_homeserver_url: "{{ matrix_homeserver_container_url }}" matrix_bot_matrix_registration_bot_matrix_homeserver_url: "{{ matrix_homeserver_container_url }}"

+ 1
- 0
roles/matrix-bot-matrix-registration-bot/tasks/validate_config.yml Просмотреть файл

@@ -6,4 +6,5 @@
You need to define a required configuration setting (`{{ item }}`). You need to define a required configuration setting (`{{ item }}`).
when: "vars[item] == ''" when: "vars[item] == ''"
with_items: with_items:
- "matrix_bot_matrix_registration_bot_bot_access_token"
- "matrix_bot_matrix_registration_bot_api_token" - "matrix_bot_matrix_registration_bot_api_token"

+ 2
- 2
roles/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2 Просмотреть файл

@@ -1,12 +1,12 @@
bot: bot:
server: "{{ matrix_bot_matrix_registration_bot_bot_server }}" server: "{{ matrix_bot_matrix_registration_bot_bot_server }}"
username: "{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}" username: "{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}"
access_token: "{{ matrix_bot_matrix_registration_bot_api_token }}"
access_token: "{{ matrix_bot_matrix_registration_bot_bot_access_token }}"
api: api:
# API endpoint of the registration tokens # API endpoint of the registration tokens
base_url: '{{ matrix_bot_matrix_registration_bot_api_base_url }}' base_url: '{{ matrix_bot_matrix_registration_bot_api_base_url }}'
# Access token of an administrator on the server # Access token of an administrator on the server
token: "{{ matrix_bot_matrix_registration_bot_matrix_admin_token }}"
token: "{{ matrix_bot_matrix_registration_bot_api_token }}"
logging: logging:
level: "{{ matrix_bot_matrix_registration_bot_logging_level }}" level: "{{ matrix_bot_matrix_registration_bot_logging_level }}"



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