Merge pull request #1131 from dreamflasher/patch-3

according to discussion in channel not needed anymore
spantaleev · Jun 21, 2021 · 10fba32 · 10fba32
2 parents efa7486 + a790096
commit 10fba32
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/docs/configuring-playbook-bridge-mx-puppet-slack.md b/docs/configuring-playbook-bridge-mx-puppet-slack.md
@@ -13,8 +13,6 @@ playbook configuration:
 
 ```yaml
 matrix_mx_puppet_slack_enabled: true
-matrix_mx_puppet_slack_client_id: ""
-matrix_mx_puppet_slack_client_secret: ""
 ```
 
 

diff --git a/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml b/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
@@ -27,8 +27,6 @@ matrix_mx_puppet_slack_homeserver_address: "{{ matrix_homeserver_container_url }
 matrix_mx_puppet_slack_homeserver_domain: '{{ matrix_domain }}'
 matrix_mx_puppet_slack_appservice_address: 'http://matrix-mx-puppet-slack:{{ matrix_mx_puppet_slack_appservice_port }}'
 
-matrix_mx_puppet_slack_client_id: ''
-matrix_mx_puppet_slack_client_secret: ''
 matrix_mx_puppet_slack_redirect_path: '/slack/oauth'
 matrix_mx_puppet_slack_redirect_uri: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mx_puppet_slack_redirect_path }}'
 

diff --git a/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2 b/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
@@ -18,10 +18,6 @@ bridge:
 # Slack OAuth settings. Create a slack app at https://api.slack.com/apps
 oauth:
   enabled: true
-  # Slack app credentials.
-  # N.B. This must be quoted so YAML wouldn't parse it as a float.
-  clientId: "{{ matrix_mx_puppet_slack_client_id }}"
-  clientSecret: {{ matrix_mx_puppet_slack_client_secret }}
   # Path where to listen for OAuth redirect callbacks.
   redirectPath: {{ matrix_mx_puppet_slack_redirect_path }}
   # Set up proxying from https://your.domain/redirect_path to http://bindAddress:port/redirect_path,
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,8 +13,6 @@ playbook configuration: @@
     ```yaml
     matrix_mx_puppet_slack_enabled: true
-    matrix_mx_puppet_slack_client_id: ""
-    matrix_mx_puppet_slack_client_secret: ""
     ```
@@ Expand Down @@