This is more consistent with how we name variables. It's also less confusing, especially given that we have `matrix_hookshot_feeds_pollTimeoutSeconds` as well.pull/2223/head
| @@ -129,8 +129,7 @@ matrix_hookshot_generic_user_id_prefix: '_webhooks_' | |||||
| matrix_hookshot_feeds_enabled: true | matrix_hookshot_feeds_enabled: true | ||||
| # polling interval in seconds | |||||
| matrix_hookshot_feeds_interval: 600 | |||||
| matrix_hookshot_feeds_pollIntervalSeconds: 600 | |||||
| matrix_hookshot_feeds_pollTimeoutSeconds: 10 | matrix_hookshot_feeds_pollTimeoutSeconds: 10 | ||||
| @@ -58,6 +58,15 @@ | |||||
| with_items: | with_items: | ||||
| - "matrix_hookshot_provisioning_secret" | - "matrix_hookshot_provisioning_secret" | ||||
| - name: (Deprecation) Catch and report renamed Hookshot variables | |||||
| ansible.builtin.fail: | |||||
| msg: >- | |||||
| Your configuration contains a variable, which now has a different name. | |||||
| Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`). | |||||
| when: "item.old in vars" | |||||
| with_items: | |||||
| - {'old': 'matrix_hookshot_feeds_interval', 'new': 'matrix_hookshot_feeds_pollIntervalSeconds'} | |||||
| - name: (Deprecation) Catch and report old metrics usage | - name: (Deprecation) Catch and report old metrics usage | ||||
| ansible.builtin.fail: | ansible.builtin.fail: | ||||
| msg: >- | msg: >- | ||||
| @@ -82,8 +82,8 @@ generic: | |||||
| feeds: | feeds: | ||||
| # (Optional) Configure this to enable RSS/Atom feed support | # (Optional) Configure this to enable RSS/Atom feed support | ||||
| # | # | ||||
| enabled: {{ matrix_hookshot_feeds_enabled }} | |||||
| pollIntervalSeconds: {{ matrix_hookshot_feeds_interval }} | |||||
| enabled: {{ matrix_hookshot_feeds_enabled | to_json }} | |||||
| pollIntervalSeconds: {{ matrix_hookshot_feeds_pollIntervalSeconds | to_json }} | |||||
| pollTimeoutSeconds: {{ matrix_hookshot_feeds_pollTimeoutSeconds | to_json }} | pollTimeoutSeconds: {{ matrix_hookshot_feeds_pollTimeoutSeconds | to_json }} | ||||
| {% endif %} | {% endif %} | ||||
| {% if matrix_hookshot_provisioning_enabled %} | {% if matrix_hookshot_provisioning_enabled %} | ||||