Version 0.7.1

.dockerignore

@@ -3,4 +3,5 @@
 .dockerignore
 node_modules
 screenshots/*
+test/*
 

CHANGELOG

@@ -104,3 +104,9 @@
 [0.6.0]
 * Fix title
 
+[0.7.0]
+* Set turn_uris to an array and not a string
+
+[0.7.1]
+* Users will now automatically join the #discuss channel (only in new installations)
+

CloudronManifest.json

@@ -4,9 +4,8 @@
   "author": "Matrix synapse authors",
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
-  "tagline": "An Open network for secure, decentralized communication",
+  "tagline": "Secure & decentralized communication",
-  "tagline": "Matrix homeserver",
+  "version": "0.7.1",
-  "version": "0.6.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
@@ -25,9 +24,9 @@
     "im", "collaboration", "voip", "videochat", "chat"
   ],
   "mediaLinks": [
-    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/924b87f40eacc15e444cd45cc93d2ead0aa440c2/1.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/606cd9d4ccc3bee11a49f91444a2dad8947cbc7c/1.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/924b87f40eacc15e444cd45cc93d2ead0aa440c2/2.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/606cd9d4ccc3bee11a49f91444a2dad8947cbc7c/2.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/924b87f40eacc15e444cd45cc93d2ead0aa440c2/3.png"
+    "https://cloudron-app-screenshots.s3.amazonaws.com/org.matrix.synapse/606cd9d4ccc3bee11a49f91444a2dad8947cbc7c/3.png"
   ],
   "changelog": "file://CHANGELOG",
   "postInstallMessage": "file://POSTINSTALL.md",

homeserver.yaml.template

@@ -1,6 +1,7 @@
 # https://github.com/matrix-org/synapse/blob/master/docs/sample_config.yaml
 
-server_name: "matrix.example.com"
+# if you change this, change the auto_join_rooms below as well
+server_name: "example.com"
 
 pid_file: /run/synapse/homeserver.pid
 
@@ -97,8 +98,9 @@ max_upload_size: 200M
 max_image_pixels: "32M"
 dynamic_thumbnails: false
 
-#auto_join_rooms:
+autocreate_auto_join_rooms: true
-#  - "#discuss:example.com"
+auto_join_rooms:
+  - "#discuss:example.com"
 
 trusted_key_servers:
   - server_name: "matrix.org"

start.sh

@@ -28,6 +28,10 @@ if [[ ! -f /app/data/configs/homeserver.yaml ]]; then
 
     yq w -i /app/data/configs/homeserver.yaml server_name "${server_name}"
     yq w -i /app/data/configs/homeserver.yaml registration_shared_secret "$(pwgen -1s 64)"
+
+    yq w -i /app/data/configs/homeserver.yaml auto_join_rooms "[]"
+    yq w -i /app/data/configs/homeserver.yaml auto_join_rooms\[0\] "#discuss:${server_name}"
+y
 fi
 
 echo "==> Configuring synapse"
@@ -55,7 +59,9 @@ yq w -i /app/data/configs/homeserver.yaml 'password_providers[0].config.bind_pas
 yq w -i /app/data/configs/homeserver.yaml 'password_providers[0].config.filter' "(objectClass=user)"
 
 # turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup)
-yq w -i /app/data/configs/homeserver.yaml turn_uris "[\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=udp\", \"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=tcp\"]"
+yq w -i /app/data/configs/homeserver.yaml turn_uris "[]"
+yq w -i /app/data/configs/homeserver.yaml turn_uris\[0\] "turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=udp"
+yq w -i /app/data/configs/homeserver.yaml turn_uris\[1\] "turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=tcp"
 yq w -i /app/data/configs/homeserver.yaml turn_shared_secret "${CLOUDRON_TURN_SECRET}"
 
 # fix permissions

test/test.js

@@ -75,9 +75,19 @@ describe('Application life cycle test', function () {
         });
     }
 
+    function checkAutoJoinRoom(done) {
+        superagent.get('https://' + app.fqdn + '/_matrix/client/r0/joined_rooms?access_token=' + token).end(function (error, result) {
+            if (error) return done(error);
+            if (result.statusCode !== 200) return done(new Error('Room listing failed with status ' + result.statusCode));
+
+            if (result.body.joined_rooms.length !== 1) return done(new Error('User must have auto-joined discuss channel:' + result.statusCode));
+            done();
+        });
+    }
+
     function createRoom(done) {
         superagent.post('https://' + app.fqdn + '/_matrix/client/r0/createRoom?access_token=' + token).send({
-            room_alias_name: 'discuss'
+            room_alias_name: 'general'
         }).end(function (error, result) {
             if (error) return done(error);
             if (result.statusCode !== 200) return done(new Error('Room creation failed with status ' + result.statusCode));
@@ -118,6 +128,7 @@ describe('Application life cycle test', function () {
 
     it('check landing page', checkLandingPage);
     it('can login', checkLogin);
+    it('check autojoin', checkAutoJoinRoom);
     it('create room', createRoom);
     it('check room', checkRoom);