.drone.yml

@@ -1,27 +1,17 @@
 ---
 kind: pipeline
-name: deploy to swarm.autonomic.zone
+name: default
 steps:
-  - name: bundle static
-    image: plugins/docker
+  - name: Deploy Autonomic.zone with Dokku
+    image: appleboy/drone-git-push:0.2.0-linux-amd64
     settings:
-      username:
-        from_secret: docker_reg_username
-      password:
-        from_secret: docker_reg_passwd
-      repo: decentral1se/autonomic.zone
-      tags: latest
-
-  - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
-    settings:
-      stack: jekyll
-      compose: docker-compose.prod.yml
-      deploy_key:
-        from_secret: drone_ssh_swarm.autonomic.zone
+      remote: ssh://dokku@dokku.autonomic.zone:222/autonomic.zone
+      force: true
+      ssh_key:
+        from_secret: drone_deploy_key
 trigger:
   branch:
     - master
-event:
-  exclude:
-    - pull_request
+  event:
+    exclude:
+      - pull_request

CHECKS

@@ -0,0 +1,5 @@
+WAIT=3
+TIMEOUT=3
+ATTEMPTS=3
+
+/

CONTRIBUTING.md

@@ -13,31 +13,24 @@ with.
 [writing posts]: https://jekyllrb.com/docs/posts/
 [creating pages]: https://jekyllrb.com/docs/pages/
 
-## Development
+## Deploy It
 
-The prerequisites are [Docker](https://www.docker.com/) and [Docker-compose](https://docs.docker.com/compose/).
+1. Push your changes to master and Dokku will try to automatically release
+1. See the [Drone dashboard to see the build](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone/)
 
-If you're on Debian, installing is easy.
+## Hack On It
 
-Install Docker.
+The only prerequisite is [Docker](https://www.docker.com/). If you're on Debian, installing is easy.
 
 ```bash
 $ curl -fsSL https://get.docker.com -o get-docker.sh  # have a look if you want
-$ CHANNEL=stable sh get-docker.sh
+$ sh get-docker.sh
 ```
 
-Install Docker-compose.
+Fire up the container with the following.
 
 ```bash
-$ cd autonomic.zone
-$ python3 -m venv .venv
-$ pip3 install -r requirements.txt
-```
-
-Then fire up the container with the following.
-
-```bash
-$ docker-compose up
+$ make dockerserver
 ```
 
 Then visit the locally running website.
@@ -46,8 +39,9 @@ Then visit the locally running website.
 
 Then you can edit the files as normal and reload the page.
 
-To stop the container when you're done, you can run:
+## Notes
 
-```bash
-$ docker-compose stop
-```
+1. For configuration, please note, we now use a `dev` environment config file:
+   `_config_dev.yml`. Hence if you edit one `_config*` file and you also want
+   that change to be reflected in the other environment ("dev", "prod") then
+   edit the other file as well!

Dockerfile

@@ -1,17 +1,15 @@
-FROM ruby:2.7.1-alpine
+FROM decentral1se/jekyll:4
 
 EXPOSE 4000
 
-RUN apk --no-cache add \
-  bash \
-  curl \
-  g++ \
-  git \
-  make
-
-RUN gem install bundler -v 2.1.4
-RUN gem install jekyll -v 4.0.0
+WORKDIR /usr/src/app
 
 COPY . ${WORKDIR}
 
+COPY sbin/* /sbin/
+
+RUN bundle config --global frozen 1
+
 RUN bundle install
+
+ENTRYPOINT ["/sbin/entrypoint.sh"]

Gemfile

@@ -1,7 +1,3 @@
 source "https://rubygems.org"
-
-ruby "2.7.1"
-
+ruby '2.6.5'
 gemspec
-
-gem "jekyll-feed"

Gemfile.lock

@@ -34,14 +34,11 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 1.8)
-    jekyll-feed (0.13.0)
-      jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.2.1)
-      rexml
+    kramdown (2.1.0)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
@@ -51,14 +48,13 @@ GEM
     mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.4)
-    rb-fsevent (0.10.4)
+    public_suffix (4.0.3)
+    rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.3)
-    rouge (3.18.0)
+    rouge (3.17.0)
     safe_yaml (1.0.5)
-    sassc (2.3.0)
+    sassc (2.2.1)
       ffi (~> 1.9)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -71,10 +67,9 @@ DEPENDENCIES
   autonomic!
   bundler (>= 2.1.4)
   jekyll (>= 4)
-  jekyll-feed
 
 RUBY VERSION
-   ruby 2.7.1p83
+   ruby 2.6.5p114
 
 BUNDLED WITH
    2.1.4

Makefile

@@ -0,0 +1,14 @@
+dockerbuild:
+	@docker build -t autonomic/autonomic.zone:testing .
+.PHONY: dockerbuild
+
+dockerserver: dockerbuild
+	@docker run \
+		-e JEKYLL_PORT=4000 \
+		-e JEKYLL_HOST=0.0.0.0 \
+		-e JEKYLL_CONFIG=_config_dev.yml \
+		-v $$(pwd):/usr/src/app \
+		-p 4000:4000 \
+		-d \
+		autonomic/autonomic.zone:testing
+.PHONY: dockerserver

_config_dev.yml

@@ -0,0 +1,28 @@
+---
+title: Autonomic Co-operative
+email: helo@autonomic.zone
+description: Sustainability, Transparency, Privacy
+baseurl: ""
+url: ""
+source: src
+destination: dist
+sass:
+  sass_dir: ./assets/styles
+featured-image-source:
+500px_url:
+github_url:
+mastodon_url: https://sunbeam.city/@autonomic
+twitter_url: https://twitter.com/autonomiccoop
+gitea_url: https://git.autonomic.zone/autonomic-cooperative/
+markdown: kramdown
+permalink: pretty
+collections:
+  posts:
+    output: true
+    permalink: /blog/:title/
+  clients:
+    output: false
+exclude:
+  - vendor
+  - Gemfile
+  - Gemfile.lock

_config_prod.yml

@@ -9,7 +9,8 @@ destination: dist
 sass:
   sass_dir: ./assets/styles
 featured-image-source:
-include: ["src/.well-known", "src/.nojekyll"]
+500px_url:
+github_url:
 mastodon_url: https://sunbeam.city/@autonomic
 twitter_url: https://twitter.com/autonomiccoop
 gitea_url: https://git.autonomic.zone/autonomic-cooperative/
@@ -25,5 +26,3 @@ exclude:
   - vendor
   - Gemfile
   - Gemfile.lock
-plugins:
-  - jekyll-feed

autonomic.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "autonomic"
-  spec.version     = "0.0.0"
-  spec.date        = "2017-09-24"
+  spec.version     = '0.0.0'
+  spec.date        = '2017-09-24'
   spec.summary     = ""
   spec.description = ""
-  spec.authors     = ["autonomic co-operative"]
-  spec.email       = "autonomic.posteo.net"
-  spec.files       = "README.md"
+  spec.authors     = ['autonomic co-operative']
+  spec.email       = 'autonomic.posteo.net'
+  spec.files       = 'README.md'
 
   spec.add_development_dependency "jekyll", ">= 4"
   spec.add_development_dependency "bundler", ">= 2.1.4"

deploy.d/config.yml

@@ -0,0 +1,11 @@
+---
+vars:
+  port: "4000"
+  domain: "autonomic.zone"
+
+env:
+  DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"
+  JEKYLL_CONFIG: "_config_prod.yml"
+  JEKYLL_ENV: "production"
+  JEKYLL_HOST: "0.0.0.0"
+  JEKYLL_PORT: "4000"

docker-compose.prod.yml

@@ -1,31 +0,0 @@
----
-version: "3.8"
-
-services:
-  jekyll:
-    image: decentral1se/autonomic.zone:latest
-    command: bundle exec jekyll serve --host 0.0.0.0 --trace
-    environment:
-      JEKYLL_ENV: production
-    networks:
-      - proxy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:4000"]
-      interval: 15s
-      timeout: 10s
-      retries: 10
-      start_period: 20s
-    deploy:
-      update_config:
-        failure_action: rollback
-        order: start-first
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.jekyll.loadbalancer.server.port=4000"
-        - "traefik.http.routers.jekyll.rule=Host(`autonomic.zone`)"
-        - "traefik.http.routers.jekyll.entrypoints=web-secure"
-        - "traefik.http.routers.jekyll.tls.certresolver=production"
-
-networks:
-  proxy:
-    external: true

docker-compose.yml

@@ -1,11 +0,0 @@
----
-version: "3.7"
-
-services:
-  jekyll:
-    image: "jekyll/jekyll:4"
-    command: jekyll serve --watch --force_polling --trace
-    volumes:
-      - ".:/srv/jekyll"
-    ports:
-      - "4000:4000"

renovate.json

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

requirements.txt

@@ -1 +0,0 @@
-docker-compose==1.27.4

sbin/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+# Fire up Jekyll with the right configuration
+run_jekyll() {
+  set -eu
+
+  bundle exec jekyll serve \
+    --config "$JEKYLL_CONFIG" \
+    --host "$JEKYLL_HOST" \
+    --port "$JEKYLL_PORT" \
+    --trace \
+    --verbose
+}
+
+# Main entrypoint
+main() {
+  set -eu
+
+  run_jekyll
+}
+
+main

src/.well-known/autonomic.zone/matrix/server

@@ -1,3 +0,0 @@
-{ 
-"m.server": "matrix.autonomic.zone:443" 
-}

src/_includes/footer.html

@@ -10,12 +10,6 @@
         <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>
-          <a title="RSS Feed" rel="me" href="{{ '/feed.xml' | absolute_url }}" style="border-bottom: none">
-            <!-- This SVG needs to be changed if you change the colour scheme as it is a massive hack. -->
-            <img alt="rss" style="height: 2rem;color: #fff" src="{{ '/assets/svg/rss-square-solid.svg' | absolute_url }}">
-          </a>
-        </li>
         <li>
           <a title="Twitter" rel="noopener" href="{{ site.twitter_url }}" style="border-bottom: none">
             <img alt="twitter" style="height: 2rem;" src="{{ '/assets/svg/twitter-brands.svg' | absolute_url }}">
@@ -54,11 +48,7 @@
         </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>
 </footer>

src/_posts/2020-04-23-dat-py.md

@@ -1,52 +0,0 @@
----
-layout: post
-title: Hyperpy, the punk-to-punk protocol in Python
-description: A new Python implementation of the Hypercore protocol is cooking at Autonomic
-image: 2020-04-23-dat-protocol.png
-category: technology, peer-to-peer, hypercore-protocol
-date: 2020-04-23
----
-
-# Hyperpy, the punk-to-punk protocol in Python
-
-We're quite excited by the new wave of community-developed peer-to-peer
-technology. [Scuttlebutt], [Cabal], [Mapeo] and [Beaker browser] are inspiring
-examples of software which show that technology can be built to operate without
-running on centralised commercially-owned infrastructure (e.g. WhatsApp).
-
-One of the underlying innovations for these technologies is the [Hypercore
-protocol], which is a way of describing how two computers can send information
-to each other directly.
-
-Today, the reference implementation of the Hypercore protocol is written in
-Javascript. The Javascript ecosystem has proved to be remarkably flexible for
-advancing this next generation of tools. Simple methods of publishing (npm
-publish), well-established distribution channels (the browser) and a
-[philosophy of modularity] have enabled so many to get started with building
-peer-to-peer technology.
-
-However, there is a great need for other languages and ecosystems to benefit
-from the tools and concepts that are being developed based on the reference
-implementation. People from all walks of life need a working implementation in
-their preferred language of choice. In response to this, we are seeing projects
-like [Datrs] and [Datcxx] emerge (please note, the Hypercore protocol was once
-called the Dat protocol, see [this blog post] for more information).
-
-Alongside these efforts, a member of Autonomic has begun to work on Hyperpy, a
-Python-based implementation of the Hypercore protocol. The project proposes a
-roadmap but offers no deadlines and receives no funding at current status.
-
-However slowly, things are moving along. Further progress updates will be
-posted on this blog as they come in. All development is taking place on
-[git.autonomic.zone/hyperpy].
-
-[scuttlebutt]: https://scuttlebutt.nz/
-[cabal]: https://cabal.chat/
-[mapeo]: https://www.digital-democracy.org/mapeo/
-[beaker browser]: https://beakerbrowser.com/
-[hypercore protocol]: https://hypercore-protocol.org/
-[philosophy of modularity]: https://mafinto.sh/blog/pragmatic-modularity.html
-[datrs]: https://github.com/datrs/
-[datcxx]: https://datcxx.github.io/
-[git.autonomic.zone/hyperpy]: https://git.autonomic.zone/hyperpy/
-[this blog post]: https://blog.datproject.org/2020/05/15/dat-protocol-renamed-hypercore-protocol/

src/assets/svg/rss-square-solid.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="rss-square" class="svg-inline--fa fa-rss-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#ffffff" d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM112 416c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm157.533 0h-34.335c-6.011 0-11.051-4.636-11.442-10.634-5.214-80.05-69.243-143.92-149.123-149.123-5.997-.39-10.633-5.431-10.633-11.441v-34.335c0-6.535 5.468-11.777 11.994-11.425 110.546 5.974 198.997 94.536 204.964 204.964.352 6.526-4.89 11.994-11.425 11.994zm103.027 0h-34.334c-6.161 0-11.175-4.882-11.427-11.038-5.598-136.535-115.204-246.161-251.76-251.76C68.882 152.949 64 147.935 64 141.774V107.44c0-6.454 5.338-11.664 11.787-11.432 167.83 6.025 302.21 141.191 308.205 308.205.232 6.449-4.978 11.787-11.432 11.787z"></path></svg>

src/gdpr.md

@@ -1,29 +0,0 @@
----
-layout: page
-title: Privacy Policy
-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.
-
-Our purpose is to provide secure services for socially responsible and progressive groups and individuals.
-
-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.
-
-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.
-
-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](mailto:helo@autonomic.zone) who will investigate the matter.
-
-See also our website privacy policy.
-
-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.
-
-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).
- 

src/privacy.md

@@ -1,16 +0,0 @@
----
-layout: page
-title: Website Privacy Policy
-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.
-
-Our Privacy Notice contains information regarding our General Data Protection Regulation 2016 (GDPR) compliance.
-
-This site does not set cookies. The source code for this website can be found [here](https://git.autonomic.zone/autonomic-cooperative/autonomic.zone).
-
-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.

src/terms.md

@@ -1,68 +0,0 @@
----
-layout: page
-title: Terms of Service
-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.
-
-## 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.
-
-## Privacy policies
-
-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.
-
-### 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.
-- 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. Typically, however, accounts are destroyed because of one of the following conditions:
-
-- 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
-
-[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 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.
-