From 3c6c15f4bfd8dcd2c15602f662a2d0b67027e430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Tue, 4 Feb 2020 19:01:27 +0100 Subject: [PATCH 01/13] Revamp 'Transparent costs' section of MaaS offering --- content/u/products/hosted-matrix-chat/contents.lr | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 473e68e..fb131e3 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -66,14 +66,13 @@ description3: ## Transparent costs -When you book a Matrix chat that is running in our [Data Center -Light](https://datacenterlight.ch), you pay for a virtual machine and -a maintenance fee, according to the VM size. +The cost is divided between a base maintenance fee and the dedicated Virtual +Machine (VM) we deploy for you in our [own +datacenter](/u/projects/data-center-light). There is no artifical restriction +on the number of users or size of rooms: the only limit is the resources +allocated to your node. We will extend them on demand, following the pricing +model (CPU, RAM, Disk) of our [VM offer](https://datacenterlight.ch/). -That's it. No artifical user or room limit. - -If you need more resources, because you are using the chat -intensively, you can upgrade your VM to a bigger model. --- offer1_title: Matrix-S 36 CHF/Month --- From 591ff4b2128c7f0c255568b260c76031dd6d0a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Tue, 4 Feb 2020 23:25:34 +0100 Subject: [PATCH 02/13] Refactor Matrix-as-a-Service description --- .../u/products/hosted-matrix-chat/contents.lr | 115 ++++++++---------- 1 file changed, 50 insertions(+), 65 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index fb131e3..d074171 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -2,76 +2,61 @@ _discoverable: yes --- _hidden: no --- -title: Hosted Matrix Chat +title: Hosted Matrix Homeserver --- -subtitle: Easy, decentralised encrypted chat ---- -feature1_title: Hosted in Switzerland ---- -feature1_text: - -The Matrix chat is hosted exclusively in Switzerland, -offering its political stability and strict privacy laws as advantages - ---- -feature2_title: Fully decentralised ---- -feature2_text: - -Everyone can run a Matrix server and by default Matrix is open for -federation. That means if you have a hosted Matrix server instance -that you can directly connect to other servers and chat with people -everywhere in the world. You can even try this out by talking to us on -**#matrix:ungleich.ch**! ---- -feature3_title: Privacy by default ---- -feature3_text: Matrix allows full end-to-end encryption (E2EE) in its -core. No additional settings required, encryption is at at the heart -of Matrix. - -Because of E2EE your messages can even be encrypted at rest - -i.e. they are not stored plaintext, if you encrypt them. - ---- -content1_image: /u/image/penguin-matrix.jpg ---- -content1_text: - -## What is Matrix? - -[Matrix](https://matrix.org/) is a decentralised chat that allows you -to have your own private conversations and at the same time be -connected to other communities. At your choice. - -Matrix features real end-to-end encryption that allows you to keep -your messages save from everyone. - -## Whom is Matrix Chat for? - -If you are interested in Open Source, if you value privacy and if -don't mind a slightly geeky interface - well, then Matrix is certainly -for you. - -If you are more looking for an end-user compatible chat, we recommend -to look at the [Mattermost based](../zero-carbon-chat/) chat. - -Matrix can be used as a replacement of Slack or IRC. It is neither -proprietary nor based on a hard to extend protocol (think of: -pictures). Like the Mattermost chat, Matrix is also running on a Zero -Carbon infrastructure. - +subtitle: Easy, decentralised & end-to-end encrypted chat --- description3: -## Transparent costs +[Matrix](https://matrix.org/) is a modern and decentralised, open-source chat +solution backed by a dynamic community and providing many advanced user-focused +features such as end-to-end encryption, bridging or audio & video calls: -The cost is divided between a base maintenance fee and the dedicated Virtual -Machine (VM) we deploy for you in our [own -datacenter](/u/projects/data-center-light). There is no artifical restriction -on the number of users or size of rooms: the only limit is the resources -allocated to your node. We will extend them on demand, following the pricing -model (CPU, RAM, Disk) of our [VM offer](https://datacenterlight.ch/). +* The strongest point of Matrix is *federation*: a Matrix homeserver - which is +what we offer - allows to manage your own community... and to join the whole +Matrix network. You will be able to exchange with users on any other Matrix +server without any special configuration! +* End-to-end encryption (E2EE) means that - when enabled - only the sender and +intended receiver(s) will be able to read the messages: even ungleich, who +manages the matrix server, will not be able to access the content of E2EE +messages. +* Our Matrix servers are provided with a TURN server, meaning that you'll be +able to use voice and video calls out of the box. +* We support bridging to other networks such as Mattermost instances, IRC, +Slack, Telegram and more via +[Matterbridge](https://github.com/42wim/matterbridge). + +There are [many Matrix clients](https://matrix.org/clients/), although we +**strongly recommend** [Riot](https://about.riot.im/features) which is the most +advanced at the moment. Be aware, however, that you might be a bit confused +with its UI/UX at first (there is ongoing work to improve onboarding): we +encourage you to [try Riot/Matrix](https://riot.im/app/) first if your are not +already familiar with it. + +
+You might be also interested in our [Mattermost-based chat +offer](../zero-carbon-chat), which might be closer to what you expect for a +corporate team chat. We use both at ungleich, using Mattermost for our internal +chat and Matrix to reach out to the world! +
+ + + +## Pricing + +The cost of our Matrix-as-a-Service offer is divided between a base maintenance +fee and the price of the dedicated Virtual Machine (VM) we deploy for you in +our [own datacenter](/u/projects/data-center-light). There is no artifical +restriction on the number of users or size of rooms: the only limit is the +resources we allocate to your node. We will extend them on demand, following +the pricing model (CPU, RAM, Disk) of our [VM +offer](https://datacenterlight.ch/). + +
+We also offer custom-sized deployment. You can discuss our offer with us by +email or even on matrix, via #matrix:ungleich.ch! +
--- offer1_title: Matrix-S 36 CHF/Month From eb601e3b0ca7d0be665e8d39f023cc0ba60f2438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Tue, 4 Feb 2020 23:32:55 +0100 Subject: [PATCH 03/13] Link to Matrix-as-a-Service FAQ --- content/u/products/hosted-matrix-chat/contents.lr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index d074171..4123fd3 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -33,6 +33,10 @@ with its UI/UX at first (there is ongoing work to improve onboarding): we encourage you to [try Riot/Matrix](https://riot.im/app/) first if your are not already familiar with it. +

+You will find more details on our Matrix-as-a-Service FAQ. +

+
You might be also interested in our [Mattermost-based chat offer](../zero-carbon-chat), which might be closer to what you expect for a From 67fb8b4b5cb198a64c8dcaa4281e772a65907706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 5 Feb 2020 19:10:52 +0100 Subject: [PATCH 04/13] Revert from 'Matrix Homserver' to 'Matrix Chat' product name --- content/u/products/hosted-matrix-chat/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 4123fd3..d98cebe 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -2,7 +2,7 @@ _discoverable: yes --- _hidden: no --- -title: Hosted Matrix Homeserver +title: Hosted Matrix Chat --- subtitle: Easy, decentralised & end-to-end encrypted chat --- From 089140a7991b2a711dcdf87ddb0a3b269bd3643e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 5 Feb 2020 19:15:19 +0100 Subject: [PATCH 05/13] Minor rephrasing on MaaS page --- content/u/products/hosted-matrix-chat/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index d98cebe..4f87fa5 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -9,7 +9,7 @@ subtitle: Easy, decentralised & end-to-end encrypted chat description3: [Matrix](https://matrix.org/) is a modern and decentralised, open-source chat -solution backed by a dynamic community and providing many advanced user-focused +solution backed by a dynamic community. It provides many advanced user-focused features such as end-to-end encryption, bridging or audio & video calls: * The strongest point of Matrix is *federation*: a Matrix homeserver - which is @@ -40,8 +40,8 @@ You will find more details on our You might be also interested in our [Mattermost-based chat offer](../zero-carbon-chat), which might be closer to what you expect for a -corporate team chat. We use both at ungleich, using Mattermost for our internal -chat and Matrix to reach out to the world! +corporate team chat. We use both at ungleich, since Matrix is especially +convenient to reach out to the world!
From 04577f281027a6d23a2ee1302153c02bea366652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 5 Feb 2020 19:24:36 +0100 Subject: [PATCH 06/13] Restore 'What is Matrix?' title on MaaS oage --- content/u/products/hosted-matrix-chat/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 4f87fa5..0ce262a 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -8,6 +8,8 @@ subtitle: Easy, decentralised & end-to-end encrypted chat --- description3: +## What is Matrix? + [Matrix](https://matrix.org/) is a modern and decentralised, open-source chat solution backed by a dynamic community. It provides many advanced user-focused features such as end-to-end encryption, bridging or audio & video calls: From 6f711b5bc15100ceb196809f0acb6704477d043f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 5 Feb 2020 19:49:02 +0100 Subject: [PATCH 07/13] Maas page: s/corporate/enterprise/ --- content/u/products/hosted-matrix-chat/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 0ce262a..86f93ca 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -42,7 +42,7 @@ You will find more details on our You might be also interested in our [Mattermost-based chat offer](../zero-carbon-chat), which might be closer to what you expect for a -corporate team chat. We use both at ungleich, since Matrix is especially +enterprise team chat. We use both at ungleich, since Matrix is especially convenient to reach out to the world! From d33a5ae8896f0116c0c3a0289ebf15ba32b73a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 10:22:22 +0100 Subject: [PATCH 08/13] MaaS page: add 'marketing' columns at the top of the page --- .../u/products/hosted-matrix-chat/contents.lr | 63 +++++++++++++++++-- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 86f93ca..998ce8d 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -5,9 +5,61 @@ _hidden: no title: Hosted Matrix Chat --- subtitle: Easy, decentralised & end-to-end encrypted chat +--- +feature1_title: Open +--- +feature1_text: + +The evolution of Matrix is managed through an open governance process, +supervised by [The Matrix.org Foundation](https://matrix.org/foundation). +Moreover, all the software backing the network is [Free and Open +Source](https://en.wikipedia.org/wiki/Free_and_open-source_software), which +guarantees quality and security. + +--- +feature2_title: Secure & decentralized +--- +feature2_text: + +Both end-to-end encryption and federation are *built-in* into Matrix. The +former will be enabled by default in the near future, making it a valuable tool +for activists and privacy-minded people all across the world. + +--- +feature3_title: Zero Carbon +--- +feature3_text: +We host your Matrix homeserver in our [own +datacenter](/u/projects/data-center-light/) in Switzerland, which we believe to +be as ecologically-friendly as a datacenter can get: we use old buildings, +second-hand hydroelectric, passive cooling and are directly plugged into a +hydroelectric power plant. + --- description3: +
+
+
+

Growing fast!

+

As of February 2020, the Matrix network supports ~13.5M visible + accounts, ~5.0M messages a day, ~40.000 federated servers and even governments!

+ +

A lot of privacy, security and usability work is going on... which + means that Matrix will get even more awesome in the coming months!

+ +

You can follow the Matrix.org + blog to get frequent updates on Matrix's development, and chat with + us on #matrix:ungleich.ch! +

+
+ +
+
+
+ ## What is Matrix? [Matrix](https://matrix.org/) is a modern and decentralised, open-source chat @@ -36,18 +88,19 @@ encourage you to [try Riot/Matrix](https://riot.im/app/) first if your are not already familiar with it.

-You will find more details on our Matrix-as-a-Service FAQ. +You will find more details on our Matrix-as-a-Service +FAQ and on Matrix's official +documentation.

You might be also interested in our [Mattermost-based chat offer](../zero-carbon-chat), which might be closer to what you expect for a -enterprise team chat. We use both at ungleich, since Matrix is especially -convenient to reach out to the world! +enterprise team chat at the moment. We use both at ungleich, since Matrix is +especially convenient to reach out to the world!
- - ## Pricing The cost of our Matrix-as-a-Service offer is divided between a base maintenance From 5f13f329f3ea02d5a19f23927a52b39a960f7bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 10:36:27 +0100 Subject: [PATCH 09/13] Add link to Matrix-aaS from Mattermost-aaS --- content/u/products/zero-carbon-chat/contents.lr | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/u/products/zero-carbon-chat/contents.lr b/content/u/products/zero-carbon-chat/contents.lr index 628979c..56ac220 100644 --- a/content/u/products/zero-carbon-chat/contents.lr +++ b/content/u/products/zero-carbon-chat/contents.lr @@ -45,6 +45,12 @@ suitable for the following use case. * If you are dealing with sensitive data over your chat that needs to be protected against the unstable political situation * If your team needs a communication platform that does not betray the team's values: in other words, if your team values protecting the environment. +
+You might be also interested in our [Matrix-based chat +offer](../zero-carbon-chat), which allows secure and decentralized +communications. +
+ ## How can I access it? You can access the chat easily from your browser or from the mobile app. From 2991f157e9ae66dddaf1083aeea752b3d81d039e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 10:39:36 +0100 Subject: [PATCH 10/13] Fix Matrix link on Mattermost page --- content/u/products/zero-carbon-chat/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/products/zero-carbon-chat/contents.lr b/content/u/products/zero-carbon-chat/contents.lr index 56ac220..c0cfebe 100644 --- a/content/u/products/zero-carbon-chat/contents.lr +++ b/content/u/products/zero-carbon-chat/contents.lr @@ -47,7 +47,7 @@ suitable for the following use case.
You might be also interested in our [Matrix-based chat -offer](../zero-carbon-chat), which allows secure and decentralized +offer](../hosted-matrix-chat), which allows secure and decentralized communications.
From b30b65f69095e2af40ff1e951f469742528b20e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 11:29:26 +0100 Subject: [PATCH 11/13] Restructure Matrix page, add details on offer --- assets/u/image/matrix-logo.png | Bin 0 -> 11948 bytes .../u/products/hosted-matrix-chat/contents.lr | 87 ++++++++++++++---- 2 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 assets/u/image/matrix-logo.png diff --git a/assets/u/image/matrix-logo.png b/assets/u/image/matrix-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6be91edde7cd207a41e933ee6bbb90a1801d287d GIT binary patch literal 11948 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 IRx}IxAI1Bp1poj5 literal 0 HcmV?d00001 diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 998ce8d..b1e300c 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -5,6 +5,66 @@ _hidden: no title: Hosted Matrix Chat --- subtitle: Easy, decentralised & end-to-end encrypted chat +--- +header: + +#### generic-header #### +headers: + +Open, Secure +Decentralized Chat + +---- +primary_color: #00B0F0 +---- +header_color: text-light +---- +nav_link_color: navbar-dark +--- +description1: + +

What is Matrix?

+ +

Matrix is a modern and decentralised, +open-source chat solution backed by a dynamic community. It provides many +advanced user-focused features such as end-to-end encryption, bridging or audio +& video calls.

+ +
+
+
+ +
+
+
    +
  • + The strongest point of Matrix is *federation*: a Matrix homeserver - which is + what we offer - allows to manage your own community... and to join the whole + Matrix network. You will be able to exchange with users on any other Matrix + server without any special configuration! +
    • +
  • + End-to-end encryption (E2EE) means that - when enabled - only the sender and + intended receiver(s) will be able to read the messages: even ungleich, who + manages the matrix server, will not be able to access the content of E2EE + messages. +
    • +
  • + Our Matrix servers are provided with a TURN server, meaning that you'll be + able to use voice and video calls out of the box. +
    • +
  • + We support bridging to other networks such as Mattermost instances, IRC, + Slack, Telegram and more via Matterbridge. +
    • +
+
+
+
+ +
+ --- feature1_title: Open --- @@ -60,25 +120,17 @@ description3: -## What is Matrix? +
-[Matrix](https://matrix.org/) is a modern and decentralised, open-source chat -solution backed by a dynamic community. It provides many advanced user-focused -features such as end-to-end encryption, bridging or audio & video calls: +## Hosted Matrix Chat -* The strongest point of Matrix is *federation*: a Matrix homeserver - which is -what we offer - allows to manage your own community... and to join the whole -Matrix network. You will be able to exchange with users on any other Matrix -server without any special configuration! -* End-to-end encryption (E2EE) means that - when enabled - only the sender and -intended receiver(s) will be able to read the messages: even ungleich, who -manages the matrix server, will not be able to access the content of E2EE -messages. -* Our Matrix servers are provided with a TURN server, meaning that you'll be -able to use voice and video calls out of the box. -* We support bridging to other networks such as Mattermost instances, IRC, -Slack, Telegram and more via -[Matterbridge](https://github.com/42wim/matterbridge). +We will provide you with your own dedicated Matrix 'Home Server', as well as a +hosted web client. Matrix requires a domain name in order to join the global +networks, which will appear in your username (e.g. +*@penguin:example.0co2.cloud*): you can either use a subdomain of *0co2.cloud* +(e.g. *example.0co2.cloud*) or your own domain name. We will deploy a +[Matterbridge](https://github.com/42wim/matterbridge) instance (bridging to +Mattermost, IRC, Slack, Telegram, ...) on demand. There are [many Matrix clients](https://matrix.org/clients/), although we **strongly recommend** [Riot](https://about.riot.im/features) which is the most @@ -153,4 +205,3 @@ offer3_text: --- offer3_link: https://ungleich.ch/product/hosted-matrix-l/ ---- From 8d5d0950c49700912da37972b9e580ba3ef8cfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 11:29:56 +0100 Subject: [PATCH 12/13] Fix typo in product template --- templates/product.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/product.html b/templates/product.html index 88002d7..f28d698 100644 --- a/templates/product.html +++ b/templates/product.html @@ -88,7 +88,7 @@
{{ this.offer3_title }}

{{ this.offer3_text }}

-j Order + Order
{% endif %} From 35d7e132b8e2042056db7eb89b781eace2f60928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 6 Feb 2020 12:57:30 +0100 Subject: [PATCH 13/13] Matrix page: split Description/Pricing into columns --- .../u/products/hosted-matrix-chat/contents.lr | 83 ++++++++++--------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index b1e300c..cd9ce65 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -100,6 +100,9 @@ description3:
+
+ +

Growing fast!

As of February 2020, the Matrix network supports ~13.5M visible @@ -114,36 +117,56 @@ description3: us on #matrix:ungleich.ch!

-
- -
-## Hosted Matrix Chat +
+
+
+

Hosted Matrix Chat

-We will provide you with your own dedicated Matrix 'Home Server', as well as a -hosted web client. Matrix requires a domain name in order to join the global -networks, which will appear in your username (e.g. -*@penguin:example.0co2.cloud*): you can either use a subdomain of *0co2.cloud* -(e.g. *example.0co2.cloud*) or your own domain name. We will deploy a -[Matterbridge](https://github.com/42wim/matterbridge) instance (bridging to -Mattermost, IRC, Slack, Telegram, ...) on demand. +

We will provide you with your own dedicated Matrix 'Home Server', as well as + a hosted web client. Matrix requires a domain name in order to join the global + networks, which will appear in your username (e.g. + @penguin:example.0co2.cloud): you can either use a subdomain of + 0co2.cloud (e.g. example.0co2.cloud) or your own domain name. We + will deploy a Matterbridge) + instance (bridging to Mattermost, IRC, Slack, Telegram, ...) on demand. +

-There are [many Matrix clients](https://matrix.org/clients/), although we -**strongly recommend** [Riot](https://about.riot.im/features) which is the most -advanced at the moment. Be aware, however, that you might be a bit confused -with its UI/UX at first (there is ongoing work to improve onboarding): we -encourage you to [try Riot/Matrix](https://riot.im/app/) first if your are not -already familiar with it. +

There are many Matrix + clients, although we strongly recommend Riot which is the most + advanced at the moment. Be aware, however, that you might be a bit + confused with its UI/UX at first (there is ongoing work to improve + onboarding): we encourage you to try + Riot/Matrix first if your are not already familiar with it. +

-

-You will find more details on our Matrix-as-a-Service -FAQ and on Matrix's official -documentation. +

+
+

Transparent Costs

+ +

The cost of our Matrix-as-a-Service offer is divided between a base maintenance + fee and the price of the dedicated Virtual Machine (VM) we deploy for you in + our own datacenter. There is no artifical + restriction on the number of users or size of rooms: the only limit is the + resources we allocate to your node. We will extend them on demand, following + the pricing model (CPU, RAM, Disk) of our VM + offer.

+ +
+ We also offer custom-sized deployment. You can discuss our offer with us by + email or even on matrix, via #matrix:ungleich.ch! +
+
+
+ +

You will find more details +on our Matrix-as-a-Service FAQ and on Matrix's official documentation.

@@ -153,22 +176,6 @@ enterprise team chat at the moment. We use both at ungleich, since Matrix is especially convenient to reach out to the world!
-## Pricing - -The cost of our Matrix-as-a-Service offer is divided between a base maintenance -fee and the price of the dedicated Virtual Machine (VM) we deploy for you in -our [own datacenter](/u/projects/data-center-light). There is no artifical -restriction on the number of users or size of rooms: the only limit is the -resources we allocate to your node. We will extend them on demand, following -the pricing model (CPU, RAM, Disk) of our [VM -offer](https://datacenterlight.ch/). - -
-We also offer custom-sized deployment. You can discuss our offer with us by -email or even on matrix, via #matrix:ungleich.ch! -
- --- offer1_title: Matrix-S 36 CHF/Month ---