Inital blog post draft

.drone.yml

@@ -10,30 +10,22 @@ steps:
       password:
         from_secret: docker_reg_passwd
       repo: decentral1se/autonomic.zone
-      tags: latest
+      tags: v2.0.0
 
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: decentral1se/drone-stack:19.03.8
     settings:
-      stack: jekyll
       compose: docker-compose.prod.yml
-      deploy_key:
+      host: tcp://swarm.autonomic.zone:2376
-        from_secret: drone_ssh_swarm.autonomic.zone
+      stack_name: jekyll
-
+      tlsverify: true
-  - name: notify rocket chat
+    environment:
-    image: plugins/slack
+      PLUGIN_CACERT:
-    settings:
+        from_secret: docker_cacert
-      webhook:
+      PLUGIN_CERT:
-        from_secret: rc_builds_url
+        from_secret: docker_cert
-      username: comradebritney
+      PLUGIN_KEY:
-      channel: "internal.builds"
+        from_secret: docker_key
-      template: "{{repo.owner}}/{{repo.name}} build failed: {{build.link}}"
-    when:
-      status:
-        - failure
 trigger:
   branch:
-    - main
+    - master
-  event:
-    exclude:
-      - pull_request

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.4-alpine3.12
+FROM ruby:2.7.1-alpine
 
 EXPOSE 4000
 

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.7.4"
+ruby "2.7.1"
 
 gemspec
 

Gemfile.lock

@@ -74,7 +74,7 @@ DEPENDENCIES
   jekyll-feed
 
 RUBY VERSION
-   ruby 2.7.3p183
+   ruby 2.7.1p83
 
 BUNDLED WITH
    2.1.4

docker-compose.prod.yml

@@ -3,10 +3,8 @@ version: "3.8"
 
 services:
   jekyll:
-    image: decentral1se/autonomic.zone:latest
+    image: decentral1se/autonomic.zone:v2.0.0
-    command: |
+    command: bundle exec jekyll serve --host 0.0.0.0 --trace
-      bundle exec
-        jekyll serve --host 0.0.0.0 --trace
     environment:
       JEKYLL_ENV: production
     networks:
@@ -27,8 +25,6 @@ services:
         - "traefik.http.routers.jekyll.rule=Host(`autonomic.zone`)"
         - "traefik.http.routers.jekyll.entrypoints=web-secure"
         - "traefik.http.routers.jekyll.tls.certresolver=production"
-        - "traefik.http.routers.jekyll.tls.options=default@file"
-        - "traefik.http.routers.jekyll.middlewares=security@file"
 
 networks:
   proxy:

docker-compose.yml

@@ -1,12 +1,10 @@
 ---
-version: "3.8"
+version: "3.7"
 
 services:
   jekyll:
-    image: decentral1se/autonomic.zone:latest
+    image: "jekyll/jekyll:4"
-    command: |
+    command: jekyll serve --watch --force_polling --trace
-      bundle exec
-        jekyll serve --watch --host 0.0.0.0 --force_polling --trace
     volumes:
       - ".:/srv/jekyll"
     ports:

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}

requirements.txt

@@ -1 +1 @@
-docker-compose==1.29.2
+docker-compose==1.25.5

src/_includes/footer.html

@@ -7,7 +7,7 @@
         Contact us to discuss your project's needs and arrange a consultation:</br>
         <b><a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></b></br></br>
         <b><a href="{{ '/assets/pgp/autonomic-key.asc' | relative_url }}">Download PGP key</a></b></br>
-        <a href= "https://git.autonomic.zone/autonomic-cooperative/autonomic.zone/src/branch/main/src/assets/pgp"> Verify fingerprint:</a><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
+        <a href= "https://git.autonomic.zone/autonomic-cooperative/autonomic.zone/src/branch/master/src/assets/pgp"> Verify fingerprint:</a><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
 
       <ul class="icons" style="margin-bottom: 0; padding-top: 1em">
         <li>
@@ -54,10 +54,6 @@
         </address></br>
           We are a Co-operative Society registered with the <a href="https://mutuals.fca.org.uk/Search/Society/30380">FCA</a>. 
           <b>Registration Number: 4597 </b>
-          </br></br>
-      </div>
-     <div style="vertical-align: bottom;">
-     <a href="{{ '/privacy' | relative_url }}">Privacy Policy</a> - <a href="{{ '/terms' | relative_url }}">Terms of Service</a> - <a href="{{ '/gdpr' | relative_url }}">GDPR</a>
       </div>
     </div>
   </div>

src/_includes/services.html

@@ -14,7 +14,7 @@
         <div>
           <h3>Websites</h3>
           <p>
-            We offer <a href="https://wordpress.com/">Wordpress</a> and static sites. Either managed or unmanaged with frictionless tools for editing and publishing that empower users. <a href="https://matomo.org/">Matomo</a> provides ethical analytics to measure impact. 
+            We offer <a href="https://wordpress.com/">Wordpress</a> and static sites. Either managed or unmanaged with frictionless tools for editing and publishing that empower users. <a href="https://matomo.org/">Matamo</a> provides ethical analytics to measure impact. 
           </p>
           </div>
       </li>

src/_posts/2020-07-13-federate-all-the-things.md

@@ -0,0 +1,22 @@
+---
+layout: post
+title: Federate all the things
+description: Autonomic launches new Matrix server
+image:
+category: updates
+date: 2020-07-13
+---
+
+# Federate all the things
+
+The chat space is a mess. Between your proprietary behemoths such as Facebook Messenger, Slack and WhatsApp to centralised libre apps such as [Signal](https://signal.org/) and Telegram (which is not fully open source), there are way too many platforms to choose from.
+
+So we decided to add another option :)
+
+At Autonomic, we are fans of decentralisation and so we keep a close eye on developments in libre messaging space. We've tried them all. [XMPP](https://xmpp.org/), [Delta Chat](https://delta.chat/en/) and [Matrix](https://matrix.org/) and even more esoteric projects. While they all have their place, we have been really impressed with the Matrix project, especially after they introduced [end to end encryption by default](https://matrix.org/blog/2020/05/06/cross-signing-and-end-to-end-encryption-by-default-is-here) earlier this year.
+
+Matrix is a federated protocol that could be used for a wide variety of uses but we are primarily seeing it being used for messaging. A Matrix server can be federated with all the other public Matrix servers and you can speak to anyone or join any room on any of these servers, just as they can join your public room. There are a [multitude of different apps](https://matrix.org/docs/projects/try-matrix-now) for every taste and a bunch of bridges into different networks such as [IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat) and pretty much all the apps we already mentioned. 
+
+For a lot of our existing clients, group chat is an important part of their organisation. We have previously been deploying [RocketChat](https://rocket.chat/) which is fully featured team chat server that we think is even better than Slack. This works well for some, however we found that a whole RocketChat server was kind kind of overkill for small organisations. Sometimes they only needed one or two channels and perhaps they wanted a mixture of public and private channels and they don't need single-sign-on. 
+
+

src/_posts/2021-01-25-how-we-make-decisions.md

@@ -1,72 +0,0 @@
----
-layout: post
-title: How we make decisions
-description: Our collective's horizontal decision making process
-image: trees.jpg
-category: decision making, democracy
-date: 2021-01-21
----
-
-# How we make decisions
-In Autonomic, we make decisions collectively, while also attempting to empower autonomous action by individual workers. 
-
-We designed our decision making process using decision making tools we had experienced through participation in various horizontal organisations. We hope this tool is useful to others in the struggle for a better world.
-
-Our decisions can be split intro three categories: **Small, Medium and Large**.
-
-## 1) Small - Get on and do the thing
-- No one cares.
-- Made by an individual within the co-op.
-- Could be in any area.
-- Up to individual co-op members to decide if they should just make the decision, or share it with the rest of the co-op to seek consensus.
-
-## 2) Medium - Consensus pending objections
-- About admin and infrastructure.
-- Doesn't have an effect on the direction or operation of the co-op.
-- Give a deadline: unless anyone objects or asks for more time by then, it goes ahead.
-- The deadline must reasonable (a week by default).
-- If any member of the co-op thinks it's a Large decision, achieve Maximum Consensus™ (see below).
-
-## 3) Large - Maximum Consensus™
-- Important decisions affecting the operation, direction, working conditions and finances of the co-op.
-- Consensus voting: addressing any concerns.
-- Can be requested by any member of the co-op for any decision.
-- Input from every co-op member.
-- Whoever proposes Large decisions is responsible for chasing up members for votes.
-- Votes can be in favour, against, abstain (stand aside) or block.
-- One member, one vote.
-
-## Process
-For Medium and Large decisions:
-
- 1. Write up a proposal in a [HedgeDoc pad](https://hedgedoc.org/).
- 2. Link to the proposal on the proposals page on our wiki.
- 3. Announce the decision in the #announcements channel of our internal chat.
- 4. List the decision on the Decisions page on our wiki.
- 4. Announce the result in #announcements and record it on the Decisions
-    page of our wiki.
-
-## Proposal format
-(For Medium and Large decisions).
-
-- What you want to change.
-- Who it affects.
-- Size (Medium / Large).
-- Deadline.
-- What chat channel you want discussion to happen in.
-
-## Example proposal
-> @all I'd like to propose (Medium|Large) decision XXX, to write our name as
-"aUtOnOmIc cöööpERATIVE" in all our public communications.
-> 
-> Deadline for votes is DEADLINE – let me know if you need more time to vote than that.
->
-> Please send absolutely any and all replies in #CHANNEL, not here 🙏
->
-> 👍 this message for "enthusiastic consent", 🤷 for "stand aside" or 👎 if you need to indicate your extreme disagreement with this idea.
->
-> 👇 VOTES HERE
-
-## Further resources
-Extra information about decision making processes in co-operatives can be found on the [Seeds for Change website](https://seedsforchange.org.uk/resources).
-

src/_posts/2021-02-16-co-op-cloud.md

@@ -1,99 +0,0 @@
----
-layout: post
-title: The Co-operative Cloud
-description: Libre software infrastructure without re-inventing the wheel
-image: coop-cloud.png
-category: coop, co-op, cloud, docker, swarm, libre-software, hosting,
-date: 2021-03-01
----
-
-Running [libre software] apps and infrastructure for ourselves and our clients is central to what we do at Autonomic. Now, after a year of work, we're stoked to share our "Co-op Cloud" project with the world. We want to make it easier for others to join the party, ditch corporate spyware, and make their tools [sustainable, transparent and private].
-
-## Why a new tool?
-
-We started out using [Cloudron], which provides a very simple-to-use web interface for deploying libre software apps like Nextcloud, Mediawiki, and Rocket.chat with only a few clicks.
-
-Cloudron allowed us to radically reduce our initial and ongoing server costs. We didn't need to maintain a separate server for each service and clients apps could share computing resources whilst containerisation was still allowing us meeting their data privacy needs. Consequently, we've been able to take on many more "solidarity clients", people doing important work, but on a shoestring budget.
-
-As time has gone on, though, we've had a few moments when we questioned our reliance on Cloudron, and whether it was a sustainable choice for us and for our clients. We came to realise:
-
-- Core parts of the system officially [became proprietary] software. This rang alarm bells for us about its long-term future.
-
-- The work to package the available apps is done [entirely by the Cloudron team itself] and doesn't re-use the existing rich ecosystem of libre software packaging work that's already being done. This seems like a big risk. If Cloudron UG, the company behind Cloudron, goes under, someone or some entity would need to take on that laborious, technically specific and non-transferable packaging work or we'd quickly be leaving ourselves and our clients running outdated and unmaintained software.
-
-- Some aspects of Cloudron's architecture were causing problems. Requiring each app to be a single Docker image makes common application deployment configurations impossible (as far as we know, nobody has yet managed to get Mediawiki's visual editor working in Cloudron, for example).
-
-- Not being able to delegate user management to specific groups has made it hard for us to use Cloudron's Single Sign On system with groups who manage their own users.
-
-- Cloudron's central paradigm is focussed on "non-technical" users with the nice web front end for managing apps. However, we found our clients don't actually need to know what "domain name" or "storage volumes" are. That's why they pay us for support. They want it to "just work". Using an interface designed for non-technical users is not suitable for technical users and adds a lot of bloat.
-
-- Cloudron is a bit of a [black box](https://en.wikipedia.org/wiki/Black_box). When something breaks, it breaks hard and requires technical users to respond and investigate and then fix the issues.
-
-- Cloudron doesn't encourage collective and public collaboration on configuration files.
-
-- We have a general fear of centralising so much of our core business on a commercial entity, which could change its prices at any time and have a massive effect on our ability to operate.
-
-## A New Hope
-
-So, around the end of 2019, we tried to map out a few core principles of a system which might work a lot like Cloudron, but give us more guarantees that we can depend on. We started calling the new project Co-op Cloud. Here are some of the principles we identified:
-
-- Always be available under [copyleft licenses] to retain the shared work as part of the [commons](https://en.wikipedia.org/wiki/Commons). We shouldn't rely on creating [artificial scarcity](https://en.wikipedia.org/wiki/Artificial_scarcity) as a business model.
-
-- Work with existing libre software communities who are already packaging and publishing their software (Nextcloud, Gitea, Mediawiki, Rocket.chat, the list goes on and on...). We want to be involved in their community spaces and build bridges between infrastructure, software development and end-users.
-
-- Based on standardised technologies. Any new tools we write should only add a thin layer of usability on top of existing solutions.
-
-- Place democratic governance at the core of the project. We want to collaborate as much as possible with other co-operatives to build up effective decision-making structures so we can all rely on this project far into the future.
-
-- Focus on meeting the needs of small hosting providers with technical workers in order to provide a solid service for their clients.
-
-- Encourage the creation of a configuration commons. Innovations based on Co-op Cloud can easily be shared and worked on collectively.
-
-In our spare time (partly funded by income from working for our wonderful clients 😀) we've been putting the pieces together; and after a year of work (including two "back to the drawing board" moments), we're ready to launch an [alpha version](https://en.wikipedia.org/wiki/Software_release_life_cycle) of Co-op Cloud to the public.
-
-## Co-op Cloud public alpha
-
-Co-op Cloud is a simple packaging format using existing [open standards] to build a catalogue of apps, and a command-line client to read the catalogue and deploy those apps.
-
-If you'd like to learn more about Co-op Cloud, please read [our documentation], where we explain the decisions we've made so far in more depth. What technologies we're using, how we fit into the existing ecosystem, ways to contribute, what apps are available and so on.
-
-We've already been deploying Co-op Cloud as part of "dual power" strategy. We use Co-op Cloud to run some of our own and our clients' infrastructure while continuing with Cloudron and other strategies for the time being. We're seeing promising stability and it's been a joy to work with.
-
-## Enter the configuration commons
-
-You can also dive straight in by installing [`abra`, Co-op Cloud's command-line tool].
-
-You can use Co-op Cloud right now to deploy any of our [30+ apps] to your own physical server or virtual server. These include [Nextcloud](https://nextcloud.com/) (for file, calendar, contacts etc) [Rocket.chat](https://rocket.chat/) for instant messaging, [Keycloak](https://www.keycloak.org/) for Single Sign-On, [Statping](https://statping.com/) for service monitoring, and websites using [Wordpress](https://wordpress.org/), [Pelican](https://blog.getpelican.com/), [Jekyll](https://jekyllrb.com/), or static HTML. See the [app catalogue](https://docs.cloud.autonomic.zone/apps/) for more.
-
-Apps deployed via Co-op Cloud have automatic SSL certificates, and many come with pre-configured e-mail, backups, or Single Sign-On options.
-
-See the [getting started guide](https://docs.cloud.autonomic.zone/overview/) to get moving fast.
-
-## Packaging for Co-op Cloud
-
-Packaging new apps for Co-op Cloud is straightforward in most cases: you can re-use an application's own Docker image (or even `docker-compose.yml` file) with minimal changes. We managed to [make a Co-op Cloud version of the Matomo web analytics platform in about 20 minutes]. This standardised architecture also means that nobody using Co-op Cloud is dependent on Autonomic for updates. When a new Wordpress update comes out, you can easily install it yourself or automatically without waiting for us to update some arcane custom Docker image.
-
-## Next steps
-
-At this point, we'd like to invite other worker co-operatives or democratic collectives to take a look at what we're working on and have a chat with us. We have a public matrix room at `#coopcloud:autonomic.zone`. We think a common platform for hosting libre software infrastructure could make a big difference in terms of what we're able to offer as a movement.
-
-If you're interested in getting involved with Co-op Cloud development, or if you'd like help trying out Co-op Cloud hosted services for yourself or your organisation, please [get in touch].
-
-## Links
-
-- [Documentation](https://cloud.autonomic.zone/)
-- [Source code](https://git.autonomic.zone/coop-cloud)
-- [Public Matrix chat](https://matrix.to/#/#coopcloud:autonomic.zone?via=autonomic.zone)
-
-[libre software]: http://wikieducator.org/Libre
-[sustainable, transparent and private]: /#core-values
-[cloudron]: https://cloudron.io/
-[became proprietary]: https://forum.cloudron.io/topic/2862/why-not-make-cloudron-fully-open-source-again
-[entirely by the cloudron team itself]: https://git.cloudron.io/cloudron
-[our documentation]: https://docs.cloud.autonomic.zone
-[`abra`, co-op cloud's command-line tool]: https://git.autonomic.zone/coop-cloud/abra/
-[30+ apps]: https://git.autonomic.zone/coop-cloud/
-[get in touch]: mailto:helo@autonomic.zone
-[copyleft licenses]: https://www.gnu.org/licenses/copyleft.en.html
-[open standards]: https://compose-spec.io/
-[make a co-op cloud version of the matomo web analytics platform in about 20 minutes]: https://docs.cloud.autonomic.zone/package/

src/_posts/2021-07-05-new-coop-cloud-blog-and-socials.md

@@ -1,10 +0,0 @@
----
-layout: post
-title: New Co-op Cloud blog, socials and updates
-description: Co-op Cloud project blog, socials and monthly updates
-image: ccblog.png
-category: coop, co-op, cloud, docker, swarm, libre-software, hosting,
-date: 2021-07-07
----
-
-The Co-op Cloud is starting to come into its own and we've decided to move our posts over to a dedicated [new and shiny blog](https://coopcloud.tech/blog/). We are working on opening up shared ownership of the project and want to create digital spaces where Autonomic is not implicitly having some sort of gate keeping role. We'll be writing regularly about our progress over there. We've also made new [Twitter](https://twitter.com/Coop_Cloud) and [Mastodon](https://social.coop/@coopcloud) which can you can follow along. That's all for now!

src/_posts/2021-08-16-website-priority-guide.md

@@ -1,61 +0,0 @@
----
-layout: post
-title: Content Priority Guides for Websites
-description: What is a Content Priority Guide and how to use it for web development
-image:
-category: autonomic, content, priority, guide, web, development, design, copywriting
-date: 2021-08-16
----
-
-A Content Priority Guide (CPG) are a simpler and faster version of [wireframes](https://en.wikipedia.org/wiki/Website_wireframe) that isn't focussed on design or the actual and encourage a client to not get bogged down in details. We found this exercise, gives the client and ourselves a clear and concise map of what the site is going to look like at an earliest stages of the project as possible. This is especially useful for smaller projects where there isn't budget or the client isn't very experienced with commissioning web development work.
-
-The content itself can then be worked on referencing the structure and hierarchy laid out in the CPG and if appropriate, the design team and front-end development team will also use the CPG in their work. The common consensus on the site layout created by the CPG allows for a "multi-threaded" approach to the project where different teams are able to work on their respective specialities simultaneously. The CPG can be updated as the project proceeds as long as all teams are aware of the changes.
-
-If a client's budget allows, Autonomic will also do more in depth collaborative processes with our clients but making a CPG together is a great starting point and requires no specialist tools or knowledge.
-
-Below is a sample Content Priority Guide. It was inspired by this [blog post](https://seesparkbox.com/foundry/content_priority_guide) and this [article](https://www.smashingmagazine.com/2012/05/design-process-responsive-age/).
-
-## Sample priority guide
-### The audience
-- Who are your audiences?
-- Can you list your audiences in order of priority?
-- What are the accessibility needs of your audiences?
-- What devices are your audiences primarily accessing the site on?
-
-### Page 1 - Homepage
-1. Heading
-2. Hero image 
-3. About Us copy (3-4 sentences)
-4. Our demands section
-	- Section Title
-	- Bullet point list of demands
-5. What we do section
-	- Section title
-	- Image
-	- What we do (A few sentences describing our activities)
-	- How we do it (A few sentences that include our principles)
-	- Our outcomes (A few paragraphs that talk about what we have achieved)
-
-### Page 2 - Projects
-1. Heading
-2. Sub-heading
-3. 6-8 items displayed in chronological order
-	- Project Title
-	- Image or Headline (if an image is provided, that will display. If there is no image, the headline will display)
-	- Project Description (2-4 sentences about the project)
-	- Link to read project details entry
-
-### Page 3 -  Blog
-1. Heading
-2. List of 6-8 blog posts
-	- Blog title
-	- Blog post publish date
-	- Blog post tags
-	- Pagination navigation links
-3. Archive blog posts drop down selectable by month
-
-### Page 4 - Contact
-1. Headline
-2. Email contact form
-3. Follow us on social media subheading and icons with links to social media pages
-

src/gdpr.md

@@ -1,47 +1,29 @@
 ---
-layout: page
+layout: default
 title: Privacy Policy
-description: Privacy policy for Autonomic Co-operative Limited
+description: Privacy policy for Autonomic Co-operative Limited.
 meta_description: This is the privacy policy for Autonomic Co-operative Limited.
 ---
 
-# Autonomic Cooperative Limited Data Protection Act 2018 (GDPR) privacy Notice.
+# Autonomic Cooperative Limited General Data Protection Regulation 2016 (GDPR) Privacy Notice.
 
-> [The Data Protection Act 2018](https://www.gov.uk/data-protection) is the UK’s implementation of the General Data Protection Regulation (GDPR).
+Our purpose is to provide secure services for socially responsible and progressive groups and individuals.
 
-## Summary
+To get in touch with Autonomic Cooperative Limited about any GPDR related issues please email [helo@autonomic.zone](helo@autonomic.zone). Our Secretary will act as contact for these matters. We do not have or believe we require a Data Protection Officer, as we do not process sensitive data, nor do our core activities require large scale systemic tracking of individuals. See the [ICO guidance](https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/accountability-and-governance/data-protection-officers/) on this.
-Our purpose is to provide secure services for socially responsible and progressive groups and individuals. We seek to minimise data collection where possible and follow best security practices.
 
-To get in touch with Autonomic Cooperative Limited about any GPDR related issues please email [helo@autonomic.zone](helo@autonomic.zone). Our Secretary will act as contact for these matters. 
-
-## Data Protection Officer
-We do not have or believe we require a Data Protection Officer, as we do not process sensitive data, nor do our core activities require large scale systemic tracking of individuals. See the [Information Commissioner’s Office (ICO) guidance](https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/accountability-and-governance/data-protection-officers/) on this.
-
-## Data Collection
 If you use our services, we may act as data processor for you. We provide information about how our systems and procedures allow you to use our service securely in our information security policy.
 
 We process data to provide Internet services. We collect names, addresses, email addresses, phone numbers of our customers so we can charge them for services and communicate with them information regarding the availability and status of their services. This processing is necessary for the performance of our contracts with them.
 
-## Logging and tracking
+This data is processed by our staff and only stored in the EU. We do not share data with 3rd parties unless this is required for the implementation of a specific service. For example to a Domain Name Registrar to complete the whois information for a domain name. The requirement to share with 3rd parties will be clearly communicated to you, and only done with explicit consent.
-Our services are configured to collect statistics including IP addresses via web server log files as is standard practice. The log files are kept for 28 days or less and are then deleted. We recommend you use [Tor Browser](https://www.torproject.org/) if you require greater anonymity.
-
-Our servers may collect web usage statistics via our private [Matamo](https://matomo.org/) analytics servers. You may opt out of Matamo tracking, the best way to do this is to set the [Do Not Track header](https://en.wikipedia.org/wiki/Do_Not_Track) in your browser or use the browser extensions [ublock origin](https://github.com/gorhill/uBlock/) and/or [Privacy Badger](https://privacybadger.org/).
-
-Occasionally our users may run alternative analytics software. This is outside of our control.
-
-## Data Storage
-This data is processed by our staff and only stored in the EU. We do not share data with 3rd parties unless this is required for the implementation of a specific service. For example, to a Domain Name Registrar to complete the whois information for a domain name. The requirement to share with 3rd parties will be clearly communicated to you, and only done with explicit consent.
 
 We are required under UK tax law to keep your basic personal data (name, address, contact details) for a minimum of 6 years after which time it will be destroyed.
 
-## Incorrect Information
+If at any point you believe the information we process on you is incorrect you request to see this information and even have it corrected or deleted. If you wish to raise a complaint on how we have handled your personal data, you can contact our Secretary [helo@autonomic.zone](helo@autonomic.zone) who will investigate the matter.
-If at any point you believe the information we process on you is incorrect you request to see this information and even have it corrected or deleted. If you wish to raise a complaint on how we have handled your personal data, you can contact our Secretary via email on [helo@autonomic.zone](mailto:helo@autonomic.zone) who will then investigate the matter.
 
-See also our [Website Privacy Policy](/privacy) and  [Terms of Service](/terms).
+See also our website privacy policy.
 
-## Third Party Services
+We use servers hosted by [Webarchitects](https://www.webarch.net/privacy-notice), [Hetzner](https://www.hetzner.com/rechtliches/datenschutz) and [Digital Ocean](https://www.digitalocean.com/legal/gdpr/) and [Gandi](https://contract.gandi.net/v5/contracts/36637/Privacy_Policy_SAS_1.1_en.pdf) for Domain names, DNS and Email, so their Data Processing Agreements also apply.
-We use servers hosted by [Webarchitects](https://www.webarch.net/privacy-notice), [Hetzner](https://www.hetzner.com/rechtliches/datenschutz) and [Digital Ocean](https://www.digitalocean.com/legal/gdpr/) and [Gandi](https://contract.gandi.net/v5/contracts/36637/Privacy_Policy_SAS_1.1_en.pdf) for Domain names, DNS and Email, so their Data Processing Agreements may also apply.
 
-## Contact us
+If you are not satisfied with our response or believe we are processing your personal data not in accordance with the law you can complain to the Information Commissioner’s Office (ICO).
-If you are not satisfied with our response or believe we are processing your personal data in a way that is not in accordance with the law you can complain to the [Information Commissioner’s Office (ICO)](https://ico.org.uk/).
  

src/privacy.md

@@ -1,18 +1,16 @@
 ---
-layout: page
+layout: default
 title: Website Privacy Policy
-description: Privacy policy for autonomic.zone
+description: Privacy policy for autonomic.zone.
 meta_description: This is the privacy policy for the website of Autonomic co-operative.
 ---
 
 # Website Privacy Policy
 
-## The Autonomic Co-operative Limited website privacy policy
+The Autonomic Co-operative Limted website privacy policy.
 
-Our Privacy Notice contains information regarding our [Data Protection Act 2018 (GDPR)](https://www.gov.uk/data-protection) compliance.
+Our Privacy Notice contains information regarding our General Data Protection Regulation 2016 (GDPR) compliance.
 
-This site does not set cookies.
+This site does not set cookies. The source code for this website can be found here.
 
-This site is configured to collect statistics including IP addresses via web server log files as is standard practice. The log files are kept for 28 days or less and are then deleted. We recommend you use [Tor Browser](https://www.torproject.org/) if you require greater anonymity. This site remains functional without [Javascript](https://en.wikipedia.org/wiki/JavaScript) enabled.
+This site is configured to collect statistics including IP addresses via web server log files as is standard practice. The log files are kept for 28 days or less and are then deleted. We reccomend you use Tor Browser if you require great anonoymity.
-
-The source code for this website can be found [here](https://git.autonomic.zone/autonomic-cooperative/autonomic.zone).

src/terms.md

@@ -1,62 +1,68 @@
 ---
-layout: page
+layout: default
 title: Terms of Service
-description: Terms of Service for autonomic.zone
+description: Terms of Service for autonomic.zone.
 meta_description: This is the Terms of Service for Autonomic Co-operative Limited.
 ---
 
 # Terms of service
-This document describes what activities are allowed, under what conditions we may terminate your account, and asserts our limited liability. It applies to all interactions with Autonomic Cooperative Limited. Your use of Autonomic Cooperative Limited's services constitutes your agreement to these Terms of Service.
+
+This document describes what activities are allowed, under what conditions we may terminate your account, and asserts our limited liability. It applies to all interactions with Autonomic Cooperative Limited. Your use of Autonomic Cooperative Limited services constitutes your agreement to these Terms of Service.
 
 ## Summary
-If you do anything truly evil, we will terminate your account. We are not liable for any damages related to the use of these services. You agree to hold patience in your heart for the hard work we do.
+
+If you do anything truly evil, we will terminate your account. We are not liable for any damages related to the use of this service. You agree to hold patience in your heart for the hard work we do.
 
 ## Privacy policies
-We ask that you review our [Privacy Policy](/gdpr), so that you are aware of how we collect and use your information.
+
+We ask that you review our Privacy Policy, so that you are aware of how we collect and use your information.
 
 ## Ownership of and responsibility for content
-All Content, whether publicly posted or privately transmitted, is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and we cannot take responsibility for such Content. 
 
-Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk. You are responsible for your use of the Services, for any Content you provide, and for any consequences thereof.
+All Content, whether publicly posted or privately transmitted, is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and we cannot take responsibility for such Content. Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk. You are responsible for your use of the Services, for any Content you provide, and for any consequences thereof.
 
 ### Refraining from certain activities
+
 You may not engage in the following activities through the services provided by Autonomic Cooperative Limited:
 
 - Harassing or abusing others by engaging in threats, stalking or sending spam. This includes usernames, aliases or using any of our resources for this purpose.
-- Misuse of services by distributing viruses or malware, engaging in a denial of service attack, or attempting to gain unauthorised access to any computer system, including this one.
+- Misuse of services by distributing viruses or malware, engaging in a denial of service attack, or attempting to gain unauthorized access to any computer system, including this one.
 - Contributing to the abuse of others by distributing material where the production process created violence or sexual assault against persons.
 
 ## Account Termination
-Autonomic Cooperative Limited may terminate your service at any time for any reason.
 
-## Limitation on Liability
+Autonomic Cooperative Limited may terminate your service at any time for any reason. Typically, however, accounts are destroyed because of one of the following conditions:
-You agree that Autonomic Cooperative Limited is not liable to you or to any other party for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data, or other intangible losses, regardless of whether we were advised of the possibility of such damage. 
 
-In the case that applicable law may not allow the limitation or exclusion of liability or incidental or consequential damages, the above limitation or exclusion may not apply to you, although our liability will be limited to the fullest extent permitted by applicable law.
+- The account has been found to be sending Spam (excessive amounts of unsolicited email).
+- The account has engaged one or more of the banned activities listed above.
+
+Limitation on Liability
+
+You agree that Autonomic Cooperative Limited is not liable to you or to any other party for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data, or other intangible losses, regardless of whether we were advised of the possibility of such damage. In the case that applicable law may not allow the limitation or exclusion of liability or incidental or consequential damages, the above limitation or exclusion may not apply to you, although our liability will be limited to the fullest extent permitted by applicable law.
 
 ### Choice of Forum and Law
+
 You agree that these Terms of Service and your use of Autonomic Cooperative Limited is governed by the law of United Kingdom.
 
 ### Policy regarding copyright infringement - DMCA
+
 Autonomic Cooperative Limited complies with the Digital Millennium Copyright Act’s notice and take-down procedures. DMCA complaints should be addressed to:
 
-```
 Autonomic Cooperative Limited
 1539 Pershore Road
 Birmingham
 B30 2JH
 United Kingdom
-```
 
-Or via email: [helo@autonomic.zone](mailto:helo@autonomic.zone)
+[mailto:helo@autonomic.zone](helo@autonomic.zone)
 
 Please note that it is Autonomic Cooperative Limited’s policy to take reasonable steps, within our power, to terminate the accounts of users who are repeat infringers in appropriate circumstances.
 
 ### No Warranty
-You understand and agree that Autonomic Cooperative Limited provides online services “as is” and without any warranty, express, implied, or statutory. 
 
-We specifically disclaim any implied warranties of title, merchant-ability, fitness for a particularly purpose and non-infringement. We make no warranty as to the reliability, accessibility, or quality of our services. You agree that the use of our services is at your sole and exclusive risk.
+You understand and agree that Autonomic Cooperative Limited provides online services “as is” and without any warranty, express, implied, or statutory. We specifically disclaim any implied warrannties of title, merchantability, fitness for a particularly purpose and non-infringement. We make no warranty as to the reliability, accessibility, or quality of our services. You agree that the use of our services is at your sole and exclusive risk.
 
 ### Changes to this policy
+
 We reserve the right to change this policy. If we make major changes, we will notify our users in a clear and prominent manner.