euantorano
/
ungleich-staticcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms

This commit is contained in:
sanghee 2020-04-10 23:26:29 +02:00
parent cffe3c640a e0cfe97a04
commit 2488fa1c21
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/u/products/backup/contents.lr
View File

@ -75,7 +75,8 @@ content2_text:
You can manage your own backup with a VM in our 2nd data center, so You can manage your own backup with a VM in our 2nd data center, so
the backup is safely stored in case of physical disasters. You can add the backup is safely stored in case of physical disasters. You can add
HDD storage on top as you want. HDD storage on top as you want. The following offers are samples based
on typical usage of backup servers customers take.
--- ---
content2_image: /u/image/diy-backup.jpg content2_image: /u/image/diy-backup.jpg

13
content/u/projects/ipv6-chat/contents.lr
View File

@ -14,10 +14,17 @@ answers to common IPv6 questions.
We have created a chat room dedicated to IPv6 so that anyone can We have created a chat room dedicated to IPv6 so that anyone can
exchange their ideas about IPv6. exchange their ideas about IPv6.
You can join the chat via ## How to join the chat
* [IPv6.chat](https://IPv6.chat) (via Mattermost) If you already have a matrix account, you can join
* #ipv6:ungleich.ch (via Matrix) **[#ipv6:ungleich.ch](https://matrix.to/#/#ipv6:ungleich.ch)** directly.
If you don't have a matrix account, you find the instructions
on [how to create a matrix account on our Open Chat
page](../open-chat).
## Other chat rooms
Note: there is also an #ipv6 channel on Freenode. We are currently Note: there is also an #ipv6 channel on Freenode. We are currently
trying to figure out whether we can bridge IPv6.chat into the IRC room trying to figure out whether we can bridge IPv6.chat into the IRC room

2
content/u/projects/open-chat/contents.lr
View File

@ -21,5 +21,7 @@ To foster IPv6 deployement, we created [IPv6.chat](../ipv6-chat),
which is also reachable via matrix. Follow above instructions and type which is also reachable via matrix. Follow above instructions and type
**/join #ipv6:ungleich.ch** instead. **/join #ipv6:ungleich.ch** instead.
## Bridged Channels
And some of our channels are also available on IRC, you can find them And some of our channels are also available on IRC, you can find them
on the [list of bridged channels](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/CHATting_with_ungleich). on the [list of bridged channels](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/CHATting_with_ungleich).