Remove broken GitHub link for Blake House

.gitignore

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

.gitlab-ci.yml

@@ -1,19 +1,9 @@
 image: ruby:2.5.3
 
-stages:
-- test
-- staging
-- production
-
 variables:
   JEKYLL_ENV: production
   LC_ALL: C.UTF-8
 
-cache:
-  key: gems
-  paths:
-    - vendor
-
 before_script:
   - 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )'
   - eval $(ssh-agent -s)
@@ -22,7 +12,7 @@ before_script:
   - chmod 700 ~/.ssh
   - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
   - chmod 644 ~/.ssh/known_hosts
-  - bundle install --path vendor
+  - bundle install
 
 test:
   stage: test
@@ -34,34 +24,25 @@ test:
   except:
   - master
 
-deploy:dev:
-  stage: staging
-  script:
-  - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/dev/
-  artifacts:
-    paths:
-    - public
-  environment:
-    name: dev
-    url: https://dev.coops.tech
-  only:
-  - master
-
 deploy:production:
-  stage: production
+  stage: deploy
   script:
   - bundle exec jekyll build -d public
-  - rsync -aqz --delete-after public/ cotech@webarch2.co.uk:sites/default/
+  - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
   artifacts:
     paths:
     - public
-  environment:
-    name: production
-    url: https://www.coops.tech
   only:
   - master
-  when: manual
 
-after_script:
+
-   - rm -rf /root/.ssh/
+deploy:dev:
+  stage: deploy
+  script:
+  - bundle exec jekyll build -d public
+  - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
+  artifacts:
+    paths:
+    - public
+  only:
+  - dev

.htaccess

@@ -1,42 +0,0 @@
-# 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
-# Work around Apache bug from 2002
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=53595
-# https://kevinlocke.name/bits/2012/07/20/serving-xhtml-with-apache-multiviews/
-Header always edit "Content-Type" ";\s*qs=[0-9]*(?:\.[0-9]+)?\s*" ""
-# Gzip these file types
-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

Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'jekyll'
-gem 'geocoder'
+
+# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75
+gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc'

Gemfile.lock

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

README.md

@@ -2,85 +2,16 @@
 
 ## 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 current Wordpress version of the [CoTech Website][] to a statically-generated site using [Jekyll][].
-
-  * 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
 
 You can run the site on your computer as if it were live online using Jekyll. You will need `git` and `ruby` installed on your machine to do this. Then clone the repository
 
-### ... using docker
-
-Make sure you have [docker](https://docs.docker.com/install/) (CE is fine) installed and running,
-and [docker-compose](https://docs.docker.com/compose/install/) installed,
-then:
-
     git clone git@git.coop:cotech/website.git
-    cd website
-    docker-compose up -d
-
-And visit [localhost:4000](http://localhost:4000) to view the site.
-
-There are two docker volumes used here:
-* `vendor` - caches the ruby gems even if you recreate the containers
-* `site` - holds the built site files to share them with httpd (and not clutter your local filesystem)
-
-A few useful things you might want to do:
-
-    # check the status of the containers
-    docker-compose ps
-
-    # stop all the containers (but don't remove them)
-    docker-compose stop
-
-    # stop and remove the containers (but leave the volumes)
-    docker-compose down
-
-    # remove everything
-    docker-compose down -v
-
-    # bring it back to life from any state you happen to be in
-    docker-compose up -d
-
-    # run some ruby/bundler commands
-    docker-compose run jekyll bundle --version
-    docker-compose run jekyll bundle update
-    docker-compose run jekyll bundle exec jekyll --help
-
-### ... directly on your machine
 
 Install the dependencies for the project
 
-    git clone git@git.coop:cotech/website.git
     cd website
     gem install bundler
     bundle install
@@ -91,25 +22,9 @@ Run a local web server so that you can view the site
 
 And visit [localhost:4000](http://localhost:4000) to view the site.
 
-**Note: not all the images will load as there is no `.htaccess` support locally**
+## Deploy CI
 
-## Deployment
+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 https://static.coops.tech/ and when changes are committed to the `dev` branch the site at https://dev.static.coops.tech/ is updated.
-
-### 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).
-
-### 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

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

_clients/Kaspersky.md

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

_clients/acorn.md

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

_clients/action-for-children.md

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

_clients/actionaid.md

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

_clients/allia-future-business-centre.md

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

_clients/alpha-complex.md

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

_clients/anna-freud-centre.md

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

_clients/apc.md

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

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

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

_clients/barbourlogic.md

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

_clients/basw.md

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

_clients/bbc-ideas.md

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

_clients/better-media.md

@@ -1,3 +0,0 @@
----
-title: Better Media
----

_clients/bioregional.md

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

_clients/blake-house.md

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

_clients/blue-cross.md

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

_clients/cairn-housing-association.md

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

_clients/cardinus.md

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

_clients/catapillr.md

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

_clients/cds-co-operatives.md

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

_clients/childrens-health-scotland.md

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

_clients/climate-outreach.md

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

_clients/commonfutures.md

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

_clients/csh.md

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

_clients/ctrl-shift.md

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

_clients/deliveroo.md

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

_clients/ecas.md

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

_clients/eden-project.md

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

_clients/en10ergy.md

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

_clients/envirogen.md

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

_clients/ethical-consumer.md

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

_clients/feps.md

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

_clients/food-standards-agency.md

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

_clients/founders-and-coders.md

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

_clients/freedom-from-torture.md

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

_clients/friend-indeed.md

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

_clients/friendshouse.md

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

_clients/froglife.md

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

_clients/fundraising-regulator.md

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

_clients/gcda.md

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

_clients/generation-rent.md

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

_clients/global-canopy-programme.md

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

_clients/greener-kirkcaldy.md

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

_clients/greenpeace.md

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

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

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

_clients/haircuts-4-homeless.md

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

_clients/health-in-touch.md

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

_clients/ica.md

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

_clients/ideo.md

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

_clients/ifsw.md

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

_clients/information-architecture-institute.md

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

_clients/invest-sk.md

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

_clients/isd.md

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

_clients/just-eat.md

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

_clients/kaizen.md

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

_clients/kaspersky.md

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

_clients/kindling-trust.md

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

_clients/labour.md

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

_clients/lancashire-womens-centres.md

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

_clients/land-explorer.md

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

_clients/law-centres-network.md

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

_clients/londonpermaculture.md

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

_clients/magpas.md

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

_clients/media-reform-coalition.md

@@ -1,3 +0,0 @@
----
-title: Media Reform Coalition
----

_clients/metal-culture.md

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

_clients/mhsgroup.md

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

_clients/modern-art-oxford.md

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

_clients/mutuo.md

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

_clients/neweconomics.md

@@ -1,4 +0,0 @@
----
-title: New Economics Foundation
-website: https://neweconomics.org/
----

_clients/nhs.md

@@ -1,3 +0,0 @@
----
-title: National Health Service
----

_clients/nswp.md

@@ -1,3 +0,0 @@
----
-title: Global Network of Sex Work Projects
----

_clients/offgrid-festival.md

@@ -1,4 +0,0 @@
----
-title: Off Grid Festival
-website: https://offgrid-festival.co.uk/
---- 

_clients/open-university.md

@@ -1,3 +1,3 @@
 ---
-title: The Open University
+title: Open University
 ---

_clients/opencoop.md

@@ -1,4 +0,0 @@
----
-title: The Open Co-op
-website: https://open.coop/
----

_clients/opendemocracy.md

@@ -1,4 +0,0 @@
----
-title: openDemocracy
-website: https://www.opendemocracy.net/
----

_clients/opportunity-peterborough.md

@@ -1,3 +0,0 @@
----
-title: Opportunity Peterborough 
----

_clients/ouh.md

@@ -1,4 +0,0 @@
----
-title: Oxford University Hospitals
-website: https://www.ouh.nhs.uk/
----

_clients/ovesco.md

@@ -1,4 +0,0 @@
----
-title: Ovesco
-website: https://ovesco.co.uk/
----

_clients/packt.md

@@ -1,3 +0,0 @@
----
-title: Packt Publishing
----

_clients/paul-murphy.md

@@ -1,3 +0,0 @@
----
-title: Paul Murphy  
----

_clients/pbi.md

@@ -1,3 +0,0 @@
----
-title: Peace Brigades International
----

_clients/peterborough-lions-international.md

@@ -1,3 +0,0 @@
----
-title: Peterborough Lions International
----

_clients/premier-league.md

@@ -1,3 +0,0 @@
----
-title: Premier League Productions 
----

_clients/primark.md

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

_clients/privacy-international.md

@@ -1,3 +0,0 @@
----
-title: Privacy International
----

_clients/public-law-project.md

@@ -1,3 +0,0 @@
----
-title: Public Law Project
----

_clients/queens-nursing-institute.md

@@ -1,4 +0,0 @@
----
-title: Queen's Nursing Institute Scotland
-website: https://www.qnis.org.uk/
----

_clients/read-with-audrey.md

@@ -1,4 +0,0 @@
----
-title: Read with Audrey
-website: https://readwithaudrey.com/
----

_clients/resilient-scotland.md

@@ -1,4 +0,0 @@
----
-title: Resilient Scotland
-website: https://www.resilientscotland.org.uk/
----

_clients/rhs.md

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

_clients/sands.md

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

_clients/sarcoma.md

@@ -1,4 +0,0 @@
----
-title: Sarcoma UK
-website: https://sarcoma.org.uk
----

_clients/shift-design.md

@@ -1,4 +0,0 @@
----
-title: Shift Design
-website: https://shiftdesign.org/
----