Merge pull request #614 from matrix-org/hs/m-a-b-3.0.0

Upgrade to matrix-appservice-bridge 3.0.0

Dockerfile

@@ -25,4 +25,4 @@ EXPOSE 9898
 EXPOSE 5858
 
 ENTRYPOINT [ "node", "lib/app.js", "-c", "/config/config.yaml" ]
-CMD [ "-p", "5858", "-f", "/config/slack-registration.yaml" ]
+CMD [ "-f", "/config/slack-registration.yaml" ]

changelog.d/614.misc

@@ -0,0 +1 @@
+Update bridge to matrix-appservice-bridge 3.1.0

config/config.sample-complete.yaml

@@ -4,6 +4,7 @@ homeserver:
   media_url: "http://my.server.here"
   max_upload_size: 104857600
   appservice_port: 5858
+  appservice_host: 0.0.0.0
 
 username_prefix: "slack_"
 

config/config.sample.yaml

@@ -18,10 +18,13 @@ homeserver:
   #max_upload_size: 104857600
 
   # Optional. Used to specify the port of the appservice in the config, rather than the command line.
-  # If this is defined, it will **override** the port given in the process arguments.
+  # This will be overriden by any ports given in the process arguments.
   #
   #appservice_port: 5858
 
+  # Optional. Used to specify the host to listen on for the appservice.
+  # appservice_host: 0.0.0.0
+
 # The prefix to give Slack users on the Matrix server
 #
 username_prefix: "slack_"

config/slack-config-schema.yaml

@@ -17,6 +17,8 @@ properties:
         type: number
       appservice_port:
         type: number
+      appservice_host:
+        type: string
   tls:
     type: object
     required: ["key_file", "crt_file"]