Revert "Delete cbn.md"

This reverts commit 9308dd83b7

.gitlab-ci.yml

@@ -1,9 +1,10 @@
-image: ruby:2.5.3
+---
+image: ruby:2.6.6
 
 stages:
-- test
+  - test
-- staging
+  - staging
-- production
+  - 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
+    - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/dev/
+    - 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
+    - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/default/
+    - 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
+# Serve .html files without extensions and allow directory listings
-Options +MultiViews
+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

README.md

@@ -1,8 +1,15 @@
 # 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. 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.
+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/

_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/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/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/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/big-brother-watch.md

@@ -0,0 +1,3 @@
+---
+title: Big Brother Watch
+---

_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/coolfarm-alliance.md

@@ -0,0 +1,3 @@
+---
+title: Coolfarm Alliance
+---

_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/erasmus-student-network.md

@@ -0,0 +1,3 @@
+---
+title: Erasmus Student Network
+---

_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-data-collaboration.md

@@ -0,0 +1,3 @@
+---
+title: Food Data Collaboration
+---

_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/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/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/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/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/kings-college-london.md

@@ -0,0 +1,3 @@
+---
+title: King's College London
+---

_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/law-centres-network.md

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

_clients/lgd.md

@@ -0,0 +1,4 @@
+---
+title: LocalGov Drupal
+website: https://localgovdrupal.org/
+---

_clients/london-school-of-economics.md

@@ -0,0 +1,3 @@
+---
+title: London School of Economics
+---

_clients/londonpermaculture.md

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

_clients/lumbung-space.md

@@ -0,0 +1,3 @@
+---
+title: Lumbung.Space
+---

_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/
+---

_clients/modern-art-oxford.md

@@ -0,0 +1,3 @@
+---
+title: Modern Art Oxford
+---

_clients/mubi.md

@@ -0,0 +1,4 @@
+---
+title: MUBI
+website: https://mubi.com/
+---