Tweaked decision making blog post

Reviewed-on: #44

.drone.yml

@@ -10,22 +10,18 @@ steps:
       password:
         from_secret: docker_reg_passwd
       repo: decentral1se/autonomic.zone
-      tags: v2.0.0
+      tags: latest
 
   - name: deployment
-    image: decentral1se/drone-stack:19.03.8
+    image: decentral1se/stack-ssh-deploy:latest
     settings:
+      stack: jekyll
       compose: docker-compose.prod.yml
-      host: tcp://swarm.autonomic.zone:2376
-      stack_name: jekyll
-      tlsverify: true
-    environment:
-      PLUGIN_CACERT:
-        from_secret: docker_cacert
-      PLUGIN_CERT:
-        from_secret: docker_cert
-      PLUGIN_KEY:
-        from_secret: docker_key
+      deploy_key:
+        from_secret: drone_ssh_swarm.autonomic.zone
 trigger:
   branch:
     - master
+event:
+  exclude:
+    - pull_request

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.1-alpine
+FROM ruby:2.7.2-alpine
 
 EXPOSE 4000
 

Gemfile

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

Gemfile.lock

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

docker-compose.prod.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   jekyll:
-    image: decentral1se/autonomic.zone:v2.0.0
+    image: decentral1se/autonomic.zone:latest
     command: bundle exec jekyll serve --host 0.0.0.0 --trace
     environment:
       JEKYLL_ENV: production
@@ -25,6 +25,8 @@ 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:

renovate.json

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

requirements.txt

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

src/_includes/footer.html

@@ -57,7 +57,7 @@
           </br></br>
       </div>
      <div style="vertical-align: bottom;">
-     <a href="{{ '/privacy/index.html' | absolute_url }}">Privacy Policy</a> - <a href="{{ '/terms/index.html' | absolute_url }}">Terms of Service</a> - <a href="{{ '/gdpr/index.html' | absolute_url }}">GDPR</a>
+     <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/">Matamo</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/">Matomo</a> provides ethical analytics to measure impact. 
           </p>
           </div>
       </li>

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

@@ -0,0 +1,72 @@
+---
+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.
+- Don't have an effect on the direction or operation of the co-op.
+- Give a deadline. Unless anyone objects or asks for more time then it passes.
+- 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/gdpr.md

@@ -1,29 +1,47 @@
 ---
-layout: default
+layout: page
 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 General Data Protection Regulation 2016 (GDPR) Privacy Notice.
+# Autonomic Cooperative Limited Data Protection Act 2018 (GDPR) privacy Notice.
 
-Our purpose is to provide secure services for socially responsible and progressive groups and individuals.
+> [The Data Protection Act 2018](https://www.gov.uk/data-protection) is the UK’s implementation of the General Data Protection Regulation (GDPR).
 
-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.
+## Summary
+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.
 
-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.
+## Logging and tracking
+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.
 
-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.
+## 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 via email on [helo@autonomic.zone](mailto:helo@autonomic.zone) who will then investigate the matter.
 
-See also our website privacy policy.
+See also our [Website Privacy Policy](/privacy) and  [Terms of Service](/terms).
 
-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.
+## 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 may also apply.
 
-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).
+## Contact us
+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,16 +1,18 @@
 ---
-layout: default
+layout: page
 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 Limted website privacy policy.
+## The Autonomic Co-operative Limited website privacy policy
 
-Our Privacy Notice contains information regarding our General Data Protection Regulation 2016 (GDPR) compliance.
+Our Privacy Notice contains information regarding our [Data Protection Act 2018 (GDPR)](https://www.gov.uk/data-protection) compliance.
 
-This site does not set cookies. The source code for this website can be found here.
+This site does not set cookies.
 
-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.
+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.
+
+The source code for this website can be found [here](https://git.autonomic.zone/autonomic-cooperative/autonomic.zone).

src/terms.md

@@ -1,68 +1,62 @@
 ---
-layout: default
+layout: page
 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 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's 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 this service. 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 these services. You agree to hold patience in your heart for the hard work we do.
 
 ## Privacy policies
-
-We ask that you review our Privacy Policy, so that you are aware of how we collect and use your information.
+We ask that you review our [Privacy Policy](/gdpr), 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. 
 
-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.
+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 unauthorized 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 unauthorised 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.
 
-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:
+## 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. 
 
-- 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.
+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
+```
 
-[mailto:helo@autonomic.zone](helo@autonomic.zone)
+Or via email: [helo@autonomic.zone](mailto: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. 
 
-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.
+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.
 
 ### 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.