Fix loomio URL

Negative longitude added instead of positive

Signed-off-by: Chris Croome <chris@webarchitects.co.uk>

.gitignore

@@ -1,3 +1,4 @@
 _site
 .idea
 vendor
+*.swp

.gitlab-ci.yml

@@ -1,9 +1,10 @@
-image: ruby:2.5.3
+---
+image: ruby:2.6.6
 
 stages:
-- test
-- staging
-- production
+  - test
+  - staging
+  - production
 
 variables:
   JEKYLL_ENV: production
@@ -20,48 +21,50 @@ before_script:
   - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
   - mkdir -p ~/.ssh
   - chmod 700 ~/.ssh
-  - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+  - ssh-keyscan web.cotech.uk > ~/.ssh/known_hosts
+  - ssh-keyscan 81.95.52.59 >> ~/.ssh/known_hosts
   - chmod 644 ~/.ssh/known_hosts
   - bundle install --path vendor
 
 test:
   stage: test
   script:
-  - bundle exec jekyll build -d test
+    - bundle exec jekyll build -d test
   artifacts:
     paths:
-    - test
+      - test
   except:
-  - master
+    - master
 
 deploy:dev:
   stage: staging
   script:
-  - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/dev/
+    - bundle exec jekyll build -d public
+    - rsync -aqz --delete-after public/ cotech@web.cotech.uk:sites/dev/
   artifacts:
     paths:
-    - public
+      - public
   environment:
     name: dev
     url: https://dev.coops.tech
   only:
-  - master
+    - master
 
 deploy:production:
   stage: production
   script:
-  - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/default/
+    - bundle exec jekyll build -d public
+    - rsync -aqz --delete-after public/ cotech@web.cotech.uk:sites/default/
   artifacts:
     paths:
-    - public
+      - public
   environment:
     name: production
     url: https://www.coops.tech
   only:
-  - master
+    - master
   when: manual
 
 after_script:
-   - rm -rf /root/.ssh/
+  - rm -rf /root/.ssh/
+...

.htaccess

@@ -1,5 +1,5 @@
-# Serve .html files without extensions
-Options +MultiViews
+# Serve .html files without extensions and allow directory listings
+Options +MultiViews +Indexes
 # If a SVG and a PNG exists the prefer the SVG
 AddType image/svg+xml;qs=0.9 svg sgvz
 AddType image/png;qs=0.8 png
@@ -12,3 +12,31 @@ AddOutputFilter DEFLATE html
 AddOutputFilter DEFLATE svg
 AddOutputFilter DEFLATE css
 AddOutputFilter DEFLATE js
+# URL's that changed
+Redirect /co-op/the-dot-project https://www.coops.tech/co-op/dot-project
+Redirect /coops/ https://www.coops.tech/co-op/
+Redirect /technology/gnu-bash https://www.coops.tech/technology/bash
+Redirect /co-op/graphics-coop https://www.coops.tech/co-op/form-and-function
+# Canonical URLs redirect to the domain with a www
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteCond %{HTTP_HOST} ^coops\.tech$
+  RewriteRule ^/?(.*) https://www.coops.tech/$1 [R,L] 
+</IfModule>
+# Redirect HTTP to HTTPS
+# https://wiki.apache.org/httpd/RewriteHTTPToHTTPS
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteCond %{HTTPS} !=on
+  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+</IfModule>
+# Strict Transport Security Header, this prevents clients 
+# with STS support from accessing the site using HTTP
+# https://stackoverflow.com/questions/24144552/how-to-set-hsts-header-from-htaccess-only-on-https
+Header set Strict-Transport-Security "max-age=31536000" env=HTTPS
+# Directory Listings
+HeaderName /top.html
+ReadmeName /bot.html
+IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=*
+IndexOptions Charset=UTF-8 SuppressHTMLPreamble XHTML TrackModified IconsAreLinks
+IndexOptions SuppressDescription

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.6

Gemfile.lock

@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.1)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.10.0)
     forwardable-extended (2.6.0)
-    geocoder (1.5.0)
+    geocoder (1.5.1)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -30,10 +30,10 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (2.1.2)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -41,14 +41,14 @@ GEM
     mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (2.2.1)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.7.2)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -62,4 +62,4 @@ DEPENDENCIES
   jekyll
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

README.md

@@ -1,8 +1,45 @@
 # CoTech Website
 
+This repo is [hosted at git.coop](https://git.coop/cotech/website) and [push mirrored to GitHub](https://github.com/cotech/jekyll-website).
+
+If you would like to contribute to this repo you have two options:
+
+1. [Join Webarchitects](https://webarch.coop/join) to [create an account at git.coop](https://webarch.coop/git#free) and then request access to the [CoTech group](https://git.coop/cotech) and when that has been granted you can update this repo directly.
+2. Use a GitHub account to create a [pull request](https://github.com/cotech/jekyll-website/pulls) at GitHub and then ask someone who is a member of [Webarchitects](https://www.webarchitects.coop/) to [patch the repo for you](https://community.coops.tech/t/cotech-website-repo-mirroring-to-github/2818).
+
 ## Introduction
 
-This is a port of the current Wordpress version of the [CoTech Website][] to a statically-generated site using [Jekyll][].
+This is a port of the old WordPress version of the CoTech website to a statically-generated site using Jekyll. The site consists of a bunch of markdown files and images stored in git.coop. The Jekyll build process is automated so that there is no need to have Jekyll installed and running to make changes to the site.
+
+  * Live site: https://coops.tech/
+  * Dev site: https://dev.coops.tech/
+
+## Updating the site
+
+It is possible to edit markdown files and upload images through the [GitLab Web IDE](https://docs.gitlab.com/ce/user/project/web_ide/). To use this, got to the [GitLab website page](https://git.coop/cotech/website) and click the Web IDE button to the left below the toolbar.
+
+Each page type lives in it's own folder.
+
+  * _clients contains client pages
+  * _coops contains coop pages
+  * _services contains service pages
+  * _technologies contains technology pages
+
+To change a coop page, edit the relevant coop file in the _coops directory. Each file contains a metadata block at the top of the file, followed by the main text describing the coop. The metadata block contains the coop details and lists of clients, services and technologies associated with the coop.
+
+If using GitLab Web IDE, make your changes to the relevant files and then commit your changes by clicking the commit button in the bottom-left corner. Add a brief description of the changes you have made as a the commit message and then click 'Stage & Commit'. It is okay to commit to the master git branch if you are simply updating your coop details, but if you are making extensive changes to many coop pages it is better to create a new branch and merge request and ask someone else to review your changes before they merge your changes in the master branch.
+
+Once your changes have been committed to the master branch an automatic build of the dev site is triggered. This will take a few minutes to run and you can check the status of the build here: https://git.coop/cotech/website/pipelines. Once the build has completed you will be able to see your changes on the dev site: https://dev.coops.tech/.
+
+If you're happy with they changes on the dev site, then you can deploy them to the live site. See the Deployment section below on how to do this.
+
+### Adding new clients, services and technologies
+
+You will need to add a new markdown file in the relevant directory for the new item. The file only needs to contain a metadata block with the details describing the new item, this is typically just a title and name (which are usually the same), but look at other items for examples.
+
+Along with the new file you will also need to upload a logo or image for the new item. Images live in a sub-directory of the images directory and should be named the same as the markdown file, but with a .png extension. Images should be formatted as a PNG and optimized for the web.
+
+Once the new file and image have been created then you can add the new client, service or technology as a list item in the metadata section of the relevant coop file.
 
 ## Run the site locally
 
@@ -65,11 +102,21 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
 
 ## Deployment
 
+### Dev/Staging
+
 When changes are committed to the `master` branch the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to [dev.coops.tech](https://dev.coops.tech).
 
-Once someone has verified that looks ok, you can use the
-[GitLab environments](https://git.coop/cotech/website/environments)
-to promote it to [www.coops.tech](https://www.coops.tech)
+### Production
+
+You need to manually deploy the changes from dev to production.
+
+1. View the changes on [dev.coops.tech](https://dev.coops.tech) and ensure you're happy for them to be pushed to production.
+
+2. Visit [GitLab environments](https://git.coop/cotech/website/environments). __NOTE.__ If you don't have access to the environments page then post a message in the [Website category of the CoTech forum](https://community.coops.tech/c/cotech/website) to ask someone to do it for you.
+
+3. Click the "Play" icon on the right of the screen in the row for the "dev" environment and choose "deploy:production".
+
+4. Your changes will be visible in production when the commit listed in the "production" environment row matches the commit listed in the "dev" environment row.
 
 ## Contributing
 

_clients/1010uk.md

@@ -0,0 +1,4 @@
+---
+title: The 10:10 Foundation 
+website: https://1010uk.org/
+---

_clients/British-Tinnitus-Association.md

@@ -0,0 +1,4 @@
+---
+title: British Tinnitus Association
+website: https://www.tinnitus.org.uk/
+---

_clients/Carefree.md

@@ -0,0 +1,4 @@
+---
+title: Carefree
+website: https://carefreespace.org/
+---

_clients/Charity-Digital.md

@@ -0,0 +1,4 @@
+---
+title: Charity Digital
+website: https://charitydigital.org.uk/
+---

_clients/Cyfannol.md

@@ -0,0 +1,4 @@
+---
+title: British Tinnitus Association
+website: https://cyfannol.org.uk/
+---

_clients/Esmee-Fairbairn.md

@@ -0,0 +1,4 @@
+---
+title: Esmee Fairbairn
+website: https://esmeefairbairn.org.uk/
+---

_clients/Family-Lives.md

@@ -0,0 +1,4 @@
+---
+title: Family Lives
+website: https://www.familylives.org.uk/
+---

_clients/Grassroots.md

@@ -0,0 +1,4 @@
+---
+title: Grassroots
+website: https://www.prevent-suicide.org.uk/
+---

_clients/Make-a-Wish.md

@@ -0,0 +1,4 @@
+---
+title: Make A Wish
+website: https://www.make-a-wish.org.uk/
+---

_clients/Parkinsons-UK.md

@@ -0,0 +1,4 @@
+---
+title: Parkinsons UK
+website: https://www.parkinsons.org.uk/
+---

_clients/SARSAS.md

@@ -0,0 +1,4 @@
+---
+title: SARSAS
+website: https://www.sarsas.org.uk/
+---

_clients/SWCTN.md

@@ -0,0 +1,4 @@
+---
+title: South West Creative Technology Network
+website: https://www.swctn.org.uk/
+---

_clients/Surviving-Economic-Abuse.md

@@ -0,0 +1,4 @@
+---
+title: Surviving Economic Abuse
+website: https://survivingeconomicabuse.org/
+---

_clients/TTC.md

@@ -0,0 +1,4 @@
+---
+title: Tech Talent Charter
+website: https://www.techtalentcharter.co.uk/
+---

_clients/The-Catalyst.md

@@ -0,0 +1,4 @@
+---
+title: The Catalyst
+website: https://www.thecatalyst.org.uk/
+---

_clients/WECA.md

@@ -0,0 +1,4 @@
+---
+title: West of England Combined Authority
+website: https://www.westofengland-ca.gov.uk/
+---

_clients/acorn.md

@@ -0,0 +1,3 @@
+---
+title: ACORN
+---

_clients/action-for-children.md

@@ -0,0 +1,4 @@
+---
+title: Action for Children
+website: https://www.actionforchildren.org.uk/
+---

_clients/actionaid.md

@@ -0,0 +1,3 @@
+---
+title: Action Aid
+---

_clients/allia-future-business-centre.md

@@ -0,0 +1,3 @@
+---
+title: Allia Future Business Centre 
+---

_clients/alpha-complex.md

@@ -0,0 +1,3 @@
+---
+title: The Alpha Complex
+---

_clients/anarchy-rules.md

@@ -0,0 +1,3 @@
+---
+title: Anarchy Rules
+---

_clients/anna-freud-centre.md

@@ -0,0 +1,4 @@
+---
+title: Anna Freud Centre
+website: https://www.annafreud.org/
+---

_clients/apc.md

@@ -0,0 +1,3 @@
+---
+title: Association for Progressive Communications
+---

_clients/ava-against-violence-and-abuse.md

@@ -0,0 +1,4 @@
+---
+title: AVA Project
+website: https://avaproject.org.uk/
+---

_clients/barbourlogic.md

@@ -0,0 +1,4 @@
+---
+title: Barbour Logic
+website: http://www.barbourlogic.co.uk/
+---

_clients/basw.md

@@ -0,0 +1,3 @@
+---
+title: The British Association of Social Workers (BASW)
+---

_clients/bbc-ideas.md

@@ -0,0 +1,3 @@
+---
+title: BBC ideas 
+---

_clients/belfast-city-council.md

@@ -0,0 +1,4 @@
+---
+title: Belfast City Council
+website: https://www.belfastcity.gov.uk
+---

_clients/bhrrc.md

@@ -0,0 +1,5 @@
+---
+title: BHRRC
+website: https://www.business-humanrights.org/
+---
+

_clients/biobulkbende.md

@@ -0,0 +1,3 @@
+---
+title: Biobulkbende
+---

_clients/bioregional.md

@@ -0,0 +1,4 @@
+---
+title: Bioregional
+website: https://www.bioregional.com/
+---

_clients/blake-house.md

@@ -0,0 +1,3 @@
+---
+title: Blake House  
+---

_clients/blue-cross.md

@@ -0,0 +1,4 @@
+---
+title: Blue Cross
+website: https://www.bluecross.org.uk/
+---

_clients/cairn-housing-association.md

@@ -1,3 +1,4 @@
 ---
 title: Cairn Housing Association
+website: https://www.cairnha.com/
 ---

_clients/campaign-against-arms-trade.md

@@ -0,0 +1,3 @@
+---
+title: Campaign Against Arms Trade
+---

_clients/cardinus.md

@@ -0,0 +1,3 @@
+---
+title: Cardinus 
+---

_clients/carerssupportcentre.md

@@ -0,0 +1,4 @@
+---
+title: Carers support centre
+website: https://www.carerssupportcentre.org.uk/
+---

_clients/cast.md

@@ -1,3 +1,4 @@
 ---
 title: CAST
+website: https://www.wearecast.org.uk/
 ---

_clients/catapillr.md

@@ -0,0 +1,4 @@
+---
+title: Catapillr
+website: https://www.catapillr.com
+---

_clients/cds-co-operatives.md

@@ -1,3 +1,4 @@
 ---
 title: CDS Co-operatives
+website: https://www.cds.coop/
 ---

_clients/childrens-health-scotland.md

@@ -0,0 +1,4 @@
+---
+title: Children’s Health Scotland
+website: https://www.childrenshealthscotland.org/
+---

_clients/climate-outreach.md

@@ -0,0 +1,3 @@
+---
+title: Climate Outreach
+---

_clients/comicrelief.md

@@ -0,0 +1,4 @@
+---
+title: Comic Relief
+website: https://www.comicrelief.com/
+---

_clients/commonfutures.md

@@ -0,0 +1,4 @@
+---
+title: Common Futures
+website: https://commonfutures.eu/
+---

_clients/coopsUK.md

@@ -0,0 +1,4 @@
+---
+title: Coops UK
+website:  https://www.uk.coop/uk
+---

_clients/crown-commercial-service.md

@@ -0,0 +1,5 @@
+---
+title: Crown Commercial Service
+website: https://www.crowncommercial.gov.uk/
+---
+

_clients/csh.md

@@ -0,0 +1,3 @@
+---
+title: The Centre for Sustainable Healthcare
+---

_clients/ctrl-group.md

@@ -0,0 +1,4 @@
+---
+title: Ctrl Group
+website: https://www.ctrl-group.com/
+---

_clients/dcms.md

@@ -0,0 +1,4 @@
+---
+title: Department for Culture, Media and Sport
+website: https://www.gov.uk/government/organisations/department-for-digital-culture-media-sport
+---

_clients/deliveroo.md

@@ -0,0 +1,3 @@
+---
+title: Deliveroo  
+---

_clients/ecas.md

@@ -0,0 +1,4 @@
+---
+title: ECAS
+website: https://www.ecas.scot/
+---

_clients/eden-project.md

@@ -0,0 +1,3 @@
+---
+title: The Eden Project
+---

_clients/en10ergy.md

@@ -0,0 +1,4 @@
+---
+title: en10ergy Limited
+website: https://en10ergy.org.uk/
+---

_clients/envirogen.md

@@ -0,0 +1,3 @@
+---
+title: Envirogen 
+---

_clients/ethical-consumer.md

@@ -0,0 +1,3 @@
+---
+title: Ethical Consumer
+---

_clients/fashion-revolution.md

@@ -0,0 +1,3 @@
+---
+title: Fashion Revolution
+---

_clients/feps.md

@@ -0,0 +1,3 @@
+---
+title: FEPS 
+---

_clients/food-standards-agency.md

@@ -0,0 +1,3 @@
+---
+title: Food Standards Agency
+---

_clients/founders-and-coders.md

@@ -0,0 +1,4 @@
+---
+title: Founders and Coders
+website: https://www.foundersandcoders.com/
+---

_clients/freedom-from-torture.md

@@ -0,0 +1,3 @@
+---
+title: Freedom from Torture
+---

_clients/friend-indeed.md

@@ -0,0 +1,4 @@
+---
+title: Friend Indeed
+website: https://www.friendindeed.org.uk/
+---

_clients/friendshouse.md

@@ -0,0 +1,3 @@
+---
+title: Friends House	
+---

_clients/froglife.md

@@ -0,0 +1,3 @@
+---
+title: Froglife 
+---

_clients/fundraising-regulator.md

@@ -0,0 +1,4 @@
+---
+title: The Fundraising Regulator
+website: https://www.fundraisingregulator.org.uk/
+---

_clients/gcda.md

@@ -0,0 +1,4 @@
+---
+title: Greenwich Co-operative Development Agency
+website: https://gcda.coop/
+---

_clients/generation-rent.md

@@ -0,0 +1,3 @@
+---
+title: Generation Rent
+---

_clients/global-canopy.md

@@ -1,3 +1,4 @@
 ---
 title: Global Canopy Programme
+website: https://www.globalcanopy.org/
 ---

_clients/good-night-out.md

@@ -0,0 +1,3 @@
+---
+title: Good Night Out
+---

_clients/greener-kirkcaldy.md

@@ -0,0 +1,4 @@
+---
+title: Greener Kirkcaldy
+website: https://www.greenerkirkcaldy.org.uk/
+---

_clients/greenpeace.md

@@ -0,0 +1,3 @@
+---
+title: Greenpeace
+---

_clients/guys-and-st-thomas-charity.md

@@ -0,0 +1,4 @@
+---
+title: Guys and St Thomas' Charity 
+website: https://www.gsttcharity.org.uk/
+---

_clients/haircuts-4-homeless.md

@@ -0,0 +1,3 @@
+---
+title: Haircuts 4 Homeless 
+---

_clients/health-in-touch.md

@@ -0,0 +1,3 @@
+---
+title: Health In Touch
+---

_clients/hookline.md

@@ -0,0 +1,5 @@
+---
+title: Hookline
+website: http://hookline.tv/
+---
+

_clients/ica.md

@@ -0,0 +1,3 @@
+---
+title: International Co-operatives Alliance
+---

_clients/ideo.md

@@ -0,0 +1,4 @@
+---
+title: IDEO
+website: https://www.ideo.com/
+---

_clients/ifsw.md

@@ -0,0 +1,3 @@
+---
+title: International Federation of Social Workers
+---

_clients/information-architecture-institute.md

@@ -1,3 +1,4 @@
 ---
 title: Information Architecture Institute
+website: https://www.iainstitute.org/
 ---

_clients/invest-sk.md

@@ -0,0 +1,3 @@
+---
+title: Invest SK 
+---

_clients/isd.md

@@ -0,0 +1,3 @@
+---
+title: Institute for Strategic Dialogue
+---

_clients/just-eat.md

@@ -0,0 +1,3 @@
+---
+title: Just Eat  
+---

_clients/kaizen.md

@@ -0,0 +1,4 @@
+---
+title: The Kaizen Partnership
+website: http://wearekaizen.co.uk/
+---

_clients/kaspersky.md

@@ -0,0 +1,3 @@
+---
+title: Kaspersky
+---

_clients/kindling-trust.md

@@ -0,0 +1,3 @@
+---
+title: Kindling Trust 
+---

_clients/labour.md

@@ -0,0 +1,3 @@
+---
+title: Labour  
+---

_clients/lancashire-womens-centres.md

@@ -0,0 +1,4 @@
+---
+title: Lancashire Women's Centres
+website: https://lancashirewomen.org/
+---

_clients/land-explorer.md

@@ -0,0 +1,3 @@
+---
+title: Land Explorer
+---

_clients/law-centres-network.md

@@ -0,0 +1,4 @@
+---
+title: Law Centres Network
+website: https://www.lawcentres.org.uk/
+---

_clients/londonpermaculture.md

@@ -0,0 +1,4 @@
+---
+title: London Permaculture Network
+website: https://www.londonpermaculture.com/
+---

_clients/magpas.md

@@ -0,0 +1,3 @@
+---
+title: Magpas 
+---

_clients/makielab.md

@@ -0,0 +1,5 @@
+---
+title: MakieLab
+website: https://twitter.com/makielab
+---
+

_clients/metal-culture.md

@@ -0,0 +1,3 @@
+---
+title: Metal Culture 
+---

_clients/mhsgroup.md

@@ -0,0 +1,4 @@
+---
+title: Muswell Hill Sustainability Group
+website: https://mhsgroup.org/
+---