Announcment 14 March

pages/07.blog/new-servers/item.en.md

@@ -0,0 +1,71 @@
+---
+title: 'New Servers - Extra storage - Nextcloud 13'
+media_order: twoServers.jpg
+published: true
+date: '14-03-2018 22:38'
+taxonomy:
+    category:
+        - news
+    tag:
+        - disroot
+        - news
+body_classes: 'single single-post'
+---
+
+### Important!
+**Changes in TOS:**
+
+Due to growing abuse of our services (mainly email) by businesses, who find it convenient to use free volunteer based service provider for the purpose of profit generation, we have added the following section to our Terms Of Service:
+
+
+> **Using Disroot services for commercial activities**<br>
+Disroot is a non-profit organization providing services for individuals on "pay as you wish" basis. Because of this structure we see using Disroot services for commercial purposes as abuse of the service and it will be treated as such.
+- Trading any Disroot services with a third party is prohibited.
+- Using email for purposes such as "no-reply" type of accounts for a business will be blocked without a warning once such activity is detected
+- Sending bulk emails, including but not limited to marketing and advertising, for business purposes, will be treated as spam and blocked upon discovery without any prior notice.
+- Using Disroot services for financial gain, including but not limited to trading or managing sales, is not tolerated. Accounts created for the purpose of generating profits will be subject to termination upon inquiry.
+- Using Disroot services for any other commercial activity will be examined per case and the decision on terminating such accounts will be based upon communication with the account holder and the type of the activities in question.
+
+
+The new section will be put in practice starting from 1st of April. If you have questions, or are not sure if you fall under this new definition, please contact us.
+
+<advertisement\> Any legit business that wish they could continue using such awesome service and support, please contact us per email to hear about our commercial offerings. </advertisement\>
+
+### New servers
+As some of you already know and have experienced, last months we were busy deploying new servers. This greatly improves overall performance of the Disroot platform as well as creates a very much needed resource buffer for the upcoming months. So without further ado meet:
+
+Knopi - our main server - Dell R410:
+  - 32GB RAM
+  - 2x L5630
+  - 4x 8TB in HWRAID10 (16TB in totoal)
+
+Nelly  - our database server - Dell R610:
+  - 88GB RAM
+  - 2xE5520
+  - 6x512GB SSD in HWRAID10 (1.5TB Total)
+
+
+The operation has taken much more time then expected and was not without mistakes, causing downtimes that could have been avoided. The sleepless nights spent in the data-center gave us a lot of experience that we surely will use next time we need to move or upgrade the infrastructure :) We would like to say we're very sorry for causing any inconvenience, and would like to thank the Disroot community for supporting us in those hard times.
+
+### Nextcloud 13
+The long awaited update to Nextcloud 13 has reached Disroot. What's new? Apart from typical performance boost, there are two major features lots of you were waiting for:
+  - Nextcloud Talk - Upgrade to the app formerly known as Spreed Calls (video/audio conferencing). Not only it has now a built in chat, but also a dedicated mobile app for managing your calls. This is still very fresh and we are looking forward to future integration with other Nextcloud apps. The rumor says Nextcloud Talk will be integrated with Matrix and XMPP. We are keeping our fingers crossed.
+
+  - End to End encryption - Is now working with Nextcloud files. Though still in alpha state and only available on Android sync client, it is possible to end-2-end encrypt your files (folder based). It is wise to be aware of its main drawback - not being able to use web-interface to access the e2e encrypted folder (it's encrypted all-right). **Please read the documentation and remember this is an early stage feature so keep a good backup of the files you intend to encrypt.**
+
+  https://nextcloud.com/endtoend/
+
+### Extra storage space
+Running out of space on your cloud or email? Finally we've got you covered. As of now you can request extra space for cloud or mailbox. Like we communicated in our previous announcement, the price per GB is 0.15euro/month and we will be first offering 14GB, 29GB, 54GB (total space) expansion. You can submit your requests via [this](https://disroot.org/en/forms/extra-storage-space) form.
+
+### Finances
+We have updated our finance chart. It looks very good! Thanks a lot to everyone who contributed so far! We were very excited to see that for the first time we were able to pay Disroot's monthly bills entirely from received donations. We hope we'll continue being surprised in the coming months too - so don't stop "buying us coffee" just yet. Furthermore, if we need to expand, upgrade hardware, get more servers (to be able to host more users and more services) we will need bigger funds. Remember, there is no such things as 'free' service and cloud is just a fancy word for someone else's computer.
+
+### New Services?
+We are getting a lot of requests for new services. We are also thinking of some additions ourselves. Naturally we can't facilitate all of them right away because of the hardware resources needed as well as work hours put into maintaining them. Given the limited resources we need to decide what is the most needed/anticipated service you would like to see on Disroot. We made a short list of services we are considering, have a look at [this](https://poll.disroot.org/ff3Qbrs1Kh74pHtN) poll and vote for your fav (no guarantees though). The poll will close on the 15th of April.
+
+<br><br>
+
+**In the coming month we are going to take things a little easier and focus on small maintenance and general spring cleaning.**
+
+**We would like to wish everybody great spring celebrations, and for those of you in the southern hemisphere - cozy autumn nights.**

pages/CHANGE.LOG

@@ -1,6 +1,8 @@
 This is changelog of disroot.org page. Here we will be noting all significant changes to the texts, such as added information, significant modifications and updates to existing ones etc.
 
 **CHANGELOG:**
+ - 14.3.2018  - Added Country field in extra-storage-space form
+                Added commercial activities section to TOS
  - 11.3.2018  - nextcloud-spreed changed to nextcloud-talk
                 added nextcloud-e2e
                 added nextcloud-x-Storage

pages/forms/extra-storage-space/form.en.md

@@ -42,6 +42,14 @@ form:
             label: ' '
             markdown: true
             content: '**Payment details:**'
+        -
+            name: country
+            label: 'Country (necessary for VAT purposes)'
+            placeholder: 'Please specify the country yourpaying account is registered in'
+            type: text
+            validate:
+                pattern: '[A-Za-z]*'
+                required: true
         -
             name: payment
             label: 'Payment via'

pages/tos/_tos/2col.en.md

@@ -17,7 +17,7 @@ Resources are scarce. Keep in mind keeping unnecessary files and emails might li
 disroot.org does not expire unused accounts. This might be a subject to change if we are forced to save up disk space for other users. Such changes in policy will be announced via all communication channels well in advance. We would rather appreciate people taking responsibility for their account and its impact on disroot resources, and rather request account deletion when they decide not to use our services any longer, or purge unused files.
 
 #### Password:
-For privacy-related reasons, we never keep track of anybody who requests the activation of a Disroot account. When creating your account, you may choose questions which will allow you to recover your password in case you lose/forget it. If you also forget the question or the answer to the question we won't be able to re-send you the data to access your account again. Remember as well to periodically change your password: you can do it by login into the user panel at user.disroot.org and clicking the 'Change password' button. **!WARNING!** Lost passwords will lead to un-recoverable cloud file loss. To protect yourself from it, you can enable  password recovery feature in your personal Cloud settings. 
+For privacy-related reasons, we never keep track of anybody who requests the activation of a Disroot account. When creating your account, you may choose questions which will allow you to recover your password in case you lose/forget it. If you also forget the question or the answer to the question we won't be able to re-send you the data to access your account again. Remember as well to periodically change your password: you can do it by login into the user panel at user.disroot.org and clicking the 'Change password' button. **!WARNING!** Lost passwords will lead to un-recoverable cloud file loss. To protect yourself from it, you can enable  password recovery feature in your personal Cloud settings.
 
 #### Spam and Viruses:
 To avoid having our servers included in blacklists, we don't want our email accounts to be used for sending spam. Any account caught doing so will be disabled without further notice.
@@ -42,8 +42,8 @@ Please refer to our privacy policy to learn more about how your information is b
 
 ---
 
-## TERM OF USE
+##   
-**Ownership of and responsibility for content**
+### Ownership of and responsibility for content**
 
 disroot.org is not responsible for any content published on any of our services. You are responsible for your use of the disroot's services, for any Content you provide, and for any consequences thereof. However, to secure our existence, we reserve the right to remove any content if found in violation with applicable law.
 
@@ -62,6 +62,15 @@ You may not engage in the following activities through the services provided by
 <li> Activity not permitted by national or international law.</li>
 </ul>
 
+### Using Disroot services for commercial activities
+Disroot is a non-profit organization providing services for individuals on "pay as you wish" basis. Because of this structure we see using Disroot services for commercial purposes as abuse of the service and it will be treated as such.
+<ul class=disc>
+<li>Trading any Disroot services with a third party is prohibited.</li>
+<li>Using email for purposes such as "no-reply" type of accounts for a business will be blocked without a warning once such activity is detected.</li>
+<li>Sending bulk emails, including but not limited to marketing and advertising, for business purposes, will be treated as spam and blocked upon discovery without any prior notice.</li>
+<li>Using Disroot services for financial gain, including but not limited to trading or managing sales, is not tolerated. Accounts created for the purpose of generating profits will be subject to termination upon inquiry.</li>
+<li>Using Disroot services for any other commercial activity will be examined per case and the decision on terminating such accounts will be based upon communication with the account holder and the type of the activities in question.</li>
+
 ### Account Termination
 disroot.org may terminate your service at any time under the following conditions:
 <ul class=disc>