From 874d2390dd2ed17ee06cc0a2887cc6b57c10a824 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 26 Jan 2020 23:07:12 +0200
Subject: [PATCH] Revert "Upgrade Slack bridge to 1.0.2"

This reverts commit 61e93744ecdaf1084d34268537a81f9cbc2f9210.

Reverting because of:
- https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/341
- https://github.com/matrix-org/matrix-appservice-slack/issues/347
---
 .../defaults/main.yml                         | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/roles/matrix-bridge-appservice-slack/defaults/main.yml b/roles/matrix-bridge-appservice-slack/defaults/main.yml
index 5c6f5e348..58babbc31 100644
--- a/roles/matrix-bridge-appservice-slack/defaults/main.yml
+++ b/roles/matrix-bridge-appservice-slack/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_appservice_slack_enabled: true
 
-matrix_appservice_slack_docker_image: "matrixdotorg/matrix-appservice-slack:release-1.0.2"
+matrix_appservice_slack_docker_image: "cadair/matrix-appservice-slack:latest"
 matrix_appservice_slack_docker_image_force_pull: "{{ matrix_appservice_slack_docker_image.endswith(':latest') }}"
 
 matrix_appservice_slack_base_path: "{{ matrix_base_data_path }}/appservice-slack"
@@ -51,24 +51,6 @@ matrix_appservice_slack_configuration_yaml: |
     bot_username: "{{ matrix_appservice_slack_bot_name }}"
     username_prefix: {{ matrix_appservice_slack_user_prefix }}
 
-    # Optional if slack_hook_port and inbound_uri_prefix are defined, required otherwise.
-    rtm:
-      # Use the RTM API to listen for requests, which does not require
-      # the bridge to listen on the hook port.
-      # You should leave this enabled, unless you plan to use the
-      # bridge exclusively for webhooks.
-      enable: true
-      logging: "silent" # Logging level specific to RTM traffic.
-      # A prefix similar to inbound_uri_prefix for oauth2 requests. inbound_uri_prefix will be used if this is not set
-      # Optional
-      # redirect_prefix: "https://my.server.here:9898/mycustomoauthendpoint"
-
-    # Allow users to add channels dynamically by using oauth, or puppet themselves.
-    # Optional
-    oauth2:
-      client_id: ""
-      client_secret: ""
-
     homeserver:
         media_url: "{{ matrix_appservice_slack_homeserver_media_url }}"
         url: "{{ matrix_appservice_slack_homeserver_url }}"