Added gitea logo to the footer and added titles to all logos

The svg is a lil bit of a hack. The svg is the proper svg logo, edited
manually. The middle transparency is actually just the background of the
current footer.

THIS NEEDS TO BE CHANGED IF THE COLOUR SCHEME CHANGES

.drone.yml

@@ -1,37 +1,17 @@
 ---
 kind: pipeline
-
 name: default
-
 steps:
-  - name: Build autonomic.zone docker image
-    image: docker:stable
-    volumes:
-      - name: docker_sock
-        path: /var/run/docker.sock
-    commands:
-      - docker build --no-cache -t autonomic/autonomic.zone:drone .
-
   - name: Deploy Autonomic.zone with Dokku
     image: appleboy/drone-git-push:0.2.0-linux-amd64
     settings:
       remote: ssh://dokku@dokku.autonomic.zone:222/autonomic.zone
+      force: true
       ssh_key:
         from_secret: drone_deploy_key
-    when:
-      branch: master
-
-  - name: Send notification to chat.internal.autonomic.zone
-    image: rmilewski/drone-rocket:latest
-    when:
-      status: [success, failure]
-    settings:
-      webhook:
-        from_secret: rocket_chat_webhook
-      channel: drone-notify
-      username: drone-notifications-bot
-      message:
-        - value: "${DRONE_COMMIT_AUTHOR} deployed site.autonomic.zone (see [commit](${DRONE_COMMIT_LINK})) :partying_face:"
-          when:
-            DRONE_BUILD_STATUS: success
-        - value: "[commit](${DRONE_COMMIT_LINK}) failed to deploy site.autonomic.zone (see [logs](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone/${DRONE_BUILD_NUMBER})) :confounded:"
+trigger:
+  branch:
+    - master
+  event:
+    exclude:
+      - pull_request

CONTRIBUTING.md

@@ -4,7 +4,9 @@
 
 For those unfamiliar with how Jekyll works, check out [jekyll.rb] for all the
 details, or read up on the basics of [front matter], [writing posts] and
-[creating pages].
+[creating pages]. Alternatively, just dive in and start editing! After all, the
+majority of this site is configuration is just flat text, so it's easy to work
+with.
 
 [jekyll.rb]: https://jekyllrb.com/
 [front matter]: https://jekyllrb.com/docs/frontmatter/

Makefile

@@ -1,10 +1,3 @@
-DEV_DIST_DIR:=dist
-
-devserver:
-	@echo "Serving development site from $(DEV_DIST_DIR)"
-	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
-.PHONY: devserver
-
 dockerbuild:
 	@docker build -t autonomic/autonomic.zone:testing .
 .PHONY: dockerbuild

README.md

@@ -2,20 +2,13 @@
 
 [![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/autonomic.zone/status.svg)](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone)
 
-> https://site.autonomic.zone
+> https://autonomic.zone
 
 A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template.
 
 [jekyll]: https://jekyllrb.com/
 [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme
 
-# Deploy
-
-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/)
-
 # Contribute
 
-Please see [CONTRIBUTING.md] for the juicy details.
-
-[contributing.md]: ./CONTRIBUTING.md
+Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for the juicy details.

_config_dev.yml

@@ -13,6 +13,7 @@ featured-image-source:
 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:

_config_prod.yml

@@ -3,7 +3,7 @@ title: Autonomic Co-operative
 email: helo@autonomic.zone
 description: Sustainability, Transparency, Privacy
 baseurl: ""
-url: "https://site.autonomic.zone"
+url: "https://autonomic.zone"
 source: src
 destination: dist
 sass:
@@ -13,6 +13,7 @@ featured-image-source:
 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:

ansible/.vault.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-echo $(pass show hosts/autonomic-dokku/vault/password)

ansible/post-deploy.yml

@@ -1,47 +0,0 @@
----
-- hosts: all
-  gather_facts: false
-  tasks:
-    - name: Load variables
-      include_vars:
-        dir: "{{ dokku_lib_root }}/data/ansible/autonomic.zone/vars/"
-        extensions:
-          - yml
-
-    - name: Set HTTP 80 port proxy
-      dokku_ports:
-        app: autonomic.zone
-        mappings:
-          - "http:80:{{ http_port }}"
-        state: present
-
-    - name: Setup LE certificates
-      shell: dokku letsencrypt autonomic.zone
-      args:
-        creates: /home/dokku/autonomic.zone/letsencrypt/certs
-
-    - name: Setup LE certificates renew cron job
-      shell: dokku letsencrypt:cron-job --add
-      args:
-        creates: /home/dokku/autonomic.zone/letsencrypt/cron-job
-
-    - name: Specify docker volume mounts
-      dokku_storage:
-        app: autonomic.zone
-        mounts:
-          - /home/dokku/autonomic.zone/letsencrypt/certs/current/key.pem:/etc/x509/https/tls.key
-          - /home/dokku/autonomic.zone/letsencrypt/certs/current/cert.pem:/etc/x509/https/tls.crt
-
-    - name: Set HTTP 443 port
-      dokku_ports:
-        app: autonomic.zone
-        mappings:
-          - "https:443:{{ http_port }}"
-        state: present
-
-    - name: Remove automatically configured ports
-      dokku_ports:
-        app: autonomic.zone
-        mappings:
-          - "http:4000:4000"
-        state: absent

ansible/pre-deploy.yml

@@ -1,54 +0,0 @@
----
-- hosts: all
-  gather_facts: false
-  tasks:
-    - name: Load variables
-      include_vars:
-        dir: "{{ dokku_lib_root }}/data/ansible/autonomic.zone/vars/"
-        extensions:
-          - yml
-
-    - name: Prepare Python system dependencies
-      become: true
-      apt:
-        name: python3-pip
-        state: present
-
-    - name: Install dns-lexicon system wide
-      become: true
-      pip:
-        name: ["cryptography==2.8", "dns-lexicon==3.3.19"]
-        executable: /usr/bin/pip3
-        state: present
-
-    - name: "Create {{ domain }} DNS entry"
-      gandi_dns:
-        gandi_rest_token: "{{ gandi_rest_token }}"
-        domain: "{{ domain }}"
-        ipv4: "{{ dokku_domain_ipv4 }}"
-        state: present
-
-    - name: "Configure the {{ domain }} domain"
-      dokku_domains:
-        app: autonomic.zone
-        domains:
-          - "{{ domain }}"
-        state: present
-
-    - name: Ensure default app configured domains go away
-      dokku_domains:
-        app: autonomic.zone
-        domains:
-          - autonomic.zone.dokku.autonomic.zone
-        state: absent
-
-    - name: Configure the dokku app environment
-      dokku_config:
-        app: autonomic.zone
-        restart: false
-        config:
-          DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}"
-          JEKYLL_HOST: "0.0.0.0"
-          JEKYLL_PORT: "{{ http_port }}"
-          JEKYLL_CONFIG: "{{ jekyll_config }}"
-          JEKYLL_ENV: "{{ jekyll_env }}"

ansible/requirements.yml

@@ -1,6 +0,0 @@
----
-- src: dokku_bot.ansible_dokku
-  version: v2020.3.15
-
-- src: https://git.autonomic.zone/autonomic-cooperative/autonomic.gandi/archive/0.0.5.tar.gz
-  name: autonomic.gandi

ansible/vars/all.yml

@@ -1,8 +0,0 @@
----
-ansible_python_interpreter: "/usr/bin/python3"
-autonomic_admin_mail: "helo@autonomic.zone"
-dokku_domain_ipv4: "94.130.105.60"
-domain: "autonomic.zone"
-http_port: "4000"
-jekyll_config: "_config_prod.yml"
-jekyll_env: "production"

ansible/vars/ansible_become_pass.yml

@@ -1,8 +0,0 @@
----
-ansible_become_pass: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  34396236353735666531323238656533643465303131663464613162396333313836363630666266
-  6539323631656635333864316166633064633366323936610a656137616334313534333635313232
-  35323561303763366563316631313638363333393763323935343563303963616334336639386462
-  3837383830616637360a373539613630356564363662393836366462666430353439353637303035
-  63396633303166343433313439303539313637306637663137313533316531616434

ansible/vars/gandi_rest_token.yml

@@ -1,8 +0,0 @@
----
-gandi_rest_token: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  65653461333739626564356366313338613561396163383161633561373736626138306633353261
-  3230376530616361343063346533633464643165643739310a303965353336353063353564643263
-  37396139643161346265616630633530353866356338386134383565363238393932666565663163
-  3831393731353735350a313235376463643439363833616263653637623363386532636132366662
-  65313835306637323066396232653166313262613333633061313266363338646334

app.json

@@ -1,5 +0,0 @@
-{
-  "name": "autonomic.zone",
-  "description": "Autonomics website on the world wide web",
-  "repository": "https://git.autonomic.zone/autonomic-cooperative/autonomic.zone"
-}

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"

requirements.txt

@@ -1 +0,0 @@
-ansible==2.9.6

sbin/encrypt.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-# Usage
-# ./encrypt.sh mysecretname mysecretvalue
-
-declare name="$1"
-declare secret="$2"
-
-ansible-vault \
-  encrypt_string \
-  --vault-password-file ansible/.vault.sh \
-  --name "$name" \
-  "$secret"

src/_includes/footer.html

@@ -4,36 +4,38 @@
     <div class="column">
       <a class="named-anchor" name="contact"></a>
         <h3>Get in Touch</h3>
-        Contact us to discuss your project's needs and arrange a consultation:
-        <a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></br></br>
-        <a href="{{ '/assets/pgp/autonomic-key.asc' | relative_url }}">PGP key:</a>
-        <code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
+        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/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 rel="noopener" href="{{ site.twitter_url }}" style="border-bottom: none">
+          <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 }}">
           </a>
         </li>
         <li>
-          <a rel="me" href="{{ site.mastodon_url }}" style="border-bottom: none">
+          <a title="Mastodon" rel="me" href="{{ site.mastodon_url }}" style="border-bottom: none">
             <img alt="mastodon" style="height: 2rem;" src="{{ '/assets/svg/mastodon-brands.svg' | absolute_url }}">
           </a>
         </li>
+        <li>
+          <a title="Gitea" rel="me" href="{{ site.gitea_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="gitea" style="height: 2.3rem;" src="{{ '/assets/svg/Gitea_Logo.svg' | absolute_url }}">
+          </a>
+        </li>
       </ul>
 
     </div>
     <div class="column">
       <div class="copyright">
-        <object style="height: 1.2rem; vertical-align: text-bottom;" type="image/svg+xml" data="{{ '/assets/svg/creative-commons-brands.svg' | absolute_url }}">
-          Your browser does not support SVG
-        </object>&nbsp;
-        {{ site.title }}
       </div>
       <div class="cotech-box">
         <a href="https://www.coops.tech/">
           <img class="cotech-logo" src="{{ '/assets/images/CoTech-white-logo.png' | relative_url }}" alt="CoTech"/>
-          <span class="cotech-text">Member of the Cotech Network</span>
+          <b><span class="cotech-text">Member of the Cotech Network</span></b>
         </a>
       </div>
       <div style="vertical-align: bottom;">
@@ -43,7 +45,9 @@
           Birmingham</br>
           B30 2JH</br>
           United Kingdom</br>
-        </address>
+        </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>
       </div>
     </div>
   </div>

src/_includes/services.html

@@ -2,10 +2,11 @@
 <section id="three" class="wrapper style6 special">
   <div class="inner">
     <header class="major">
-      <h2>Cooperative Cloud: For Organisations</h2>
+      <h2>Cooperative Cloud Infrastructure</h2>
       <p>
-        This isn't an exhaustive list - if you don't see what you need, please contact us anyway.
+        This isn't an exhaustive list. If you don't see what you need, please contact us anyway for a consultation:
       </p>
+      <h3><a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></h3>
     </header>
     <ul class="features">
       <li class="features-item">

src/assets/svg/Gitea_Logo.svg

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="512" height="512" viewBox="0 0 135.46667 135.46667" version="1.1" id="svg8" sodipodi:docname="logo.svg" inkscape:version="0.92.1 r15371" inkscape:export-filename="" inkscape:export-xdpi="48.000004" inkscape:export-ydpi="48.000004">
+  <defs id="defs2"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="0.70710678" inkscape:cx="418.13805" inkscape:cy="177.57445" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" units="px" width="256px" showguides="false" inkscape:window-width="1920" inkscape:window-height="1137" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:pagecheckerboard="false" inkscape:measure-start="283.373,243.952" inkscape:measure-end="290.267,236.527">
+    <sodipodi:guide position="0,0" orientation="0,512" id="guide3699" inkscape:locked="false"/>
+    <sodipodi:guide position="135.46667,0" orientation="-512,0" id="guide3701" inkscape:locked="false"/>
+    <sodipodi:guide position="135.46667,135.46667" orientation="0,-512" id="guide3703" inkscape:locked="false"/>
+    <sodipodi:guide position="0,135.46667" orientation="512,0" id="guide3705" inkscape:locked="false"/>
+  </sodipodi:namedview>
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-161.53334)" style="display:inline">
+    <path style="fill:#ffffff;fill-opacity:1;stroke:#428f29;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" d="m 27.709937,195.15095 c -9.546573,-0.0272 -22.3392732,6.79805 -21.6317552,23.90397 1.105534,26.72889 25.4565952,29.20839 35.1916502,29.42301 1.068023,5.01357 12.521798,22.30563 21.001818,23.21667 h 37.15277 c 22.27763,-1.66785 38.9607,-75.75671 26.59321,-76.03825 -46.781583,2.47691 -49.995146,2.13838 -88.599758,0 -2.495053,-0.0266 -5.972321,-0.49474 -9.707935,-0.5054 z m 2.491319,9.45886 c 1.351378,13.69267 3.555849,21.70359 8.018216,33.94345 -11.382872,-1.50473 -21.069822,-5.22443 -22.851515,-19.10984 -0.950962,-7.4112 2.390428,-15.16769 14.833299,-14.83361 z" id="path3722" inkscape:connector-curvature="0" sodipodi:nodetypes="sscccccsccsc"/>
+  </g>
+  <g inkscape:groupmode="layer" id="layer2" inkscape:label="Layer 2" style="display:inline">
+    <rect style="display:inline;fill:#1d2442;fill-opacity:1;stroke:none;stroke-width:0.24757317;stroke-opacity:1" id="rect4599" width="34.762054" height="34.762054" x="87.508659" y="18.291576" transform="rotate(25.914715)" ry="5.4825778"/>
+    <path style="display:inline;fill:#1d2442;fill-opacity:1;stroke:none;stroke-width:0.26644793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 79.804947,57.359056 3.241146,1.609954 V 35.255731 h -3.262698 z" id="path4525" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+  </g>
+  <g inkscape:groupmode="layer" id="layer3" inkscape:label="Layer 3" style="display:inline">
+    <g style="display:inline" id="g4539">
+      <circle transform="rotate(-19.796137)" r="3.4745038" cy="90.077766" cx="49.064713" id="path4606" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
+      <circle transform="rotate(-19.796137)" r="3.4745038" cy="102.1049" cx="36.810425" id="path4606-3" style="fill:#ffffff6;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
+      <circle transform="rotate(-19.796137)" r="3.4745038" cy="111.43928" cx="46.484283" id="path4606-1" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
+      <rect transform="rotate(26.024158)" y="18.061695" x="97.333458" height="27.261492" width="2.6726954" id="rect4629-8" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27444693;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4514" d="m 76.558096,68.116343 c 12.97589,6.395378 13.012989,4.101862 4.890858,20.907244" style="fill:none;stroke:#ffffff;stroke-width:2.68000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    </g>
+  </g>
+</svg>