Merge branch 'master' into pub.solar

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 2020-04-28
+
+## Newer IRC bridge (with potential breaking change)
+
+This upgrades matrix-appservice-irc from 0.14.1 to 0.16.0.  Upstream
+made a change to how you define manual mappings.  If you added a
+`mapping` to your configuration, you will need to update it accoring
+to the [upstream
+instructions](https://github.com/matrix-org/matrix-appservice-irc/blob/master/CHANGELOG.md#0150-2020-02-05).
+If you did not include `mappings` in your configuration for IRC, no
+change is necessary.  `mappings` is not part of the default
+configuration.
+
 # 2020-04-23
 
 ## Slack bridging support

docs/configuring-playbook-matrix-corporal.md

@@ -26,7 +26,8 @@ matrix_corporal_policy_provider_config: |
     "Uri": "https://intranet.example.com/matrix/policy",
     "AuthorizationBearerToken": "SOME_SECRET",
     "CachePath": "/var/cache/matrix-corporal/last-policy.json",
-    "ReloadIntervalSeconds": 1800
+    "ReloadIntervalSeconds": 1800,
+    "TimeoutMilliseconds": 300
   }
 
 # If you also want to enable Matrix Corporal's HTTP API..

roles/matrix-bridge-appservice-irc/defaults/main.yml

@@ -3,7 +3,7 @@
 
 matrix_appservice_irc_enabled: true
 
-matrix_appservice_irc_docker_image: "matrixdotorg/matrix-appservice-irc:release-0.14.1"
+matrix_appservice_irc_docker_image: "matrixdotorg/matrix-appservice-irc:release-0.16.0"
 matrix_appservice_irc_docker_image_force_pull: "{{ matrix_appservice_irc_docker_image.endswith(':latest') }}"
 
 matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"
@@ -235,7 +235,11 @@ matrix_appservice_irc_ircService_servers: []
 #       # 1:many mappings from IRC channels to room IDs on this IRC server.
 #       # The matrix room must already exist. Your matrix client should expose
 #       # the room ID in a "settings" page for the room.
-#       "#thepub": ["!kieouiJuedJoxtVdaG:localhost"]
+#       "#thepub":
+#         roomIds: ["!kieouiJuedJoxtVdaG:localhost"]
+#         # Channel key/password to use. Optional. If provided, matrix users do
+#         # not need to know the channel key in order to join the channel.
+#         # key: "secret"
 
 #     # Configuration for virtual matrix users. The following variables are
 #     # exposed: