Compare commits

..

1 Commits

Author SHA1 Message Date
Martin Burchell 023d66d0d4 Remove broken GitHub link for Blake House 2018-11-29 17:13:34 +00:00
644 changed files with 20448 additions and 62677 deletions

4
.gitignore vendored
View File

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


View File

@ -1,19 +1,9 @@
image: ruby:2.6.6
stages:
- test
- staging
- production
image: ruby:2.5.3
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

View File

@ -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

View File

@ -1 +1 @@
2.6.6
2.5.3

View File

@ -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'

View File

@ -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)
sass (~> 3.4)
jekyll-watch (2.2.1)
jekyll-watch (2.1.2)
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)
ffi (~> 1.0)
rouge (3.3.0)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby_dep (1.5.0)
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)
rb-inotify (~> 0.9, >= 0.9.7)
safe_yaml (1.0.4)
sassc (2.0.0)
ffi (~> 1.9.6)
rake
PLATFORMS
ruby
DEPENDENCIES
geocoder
jekyll
jekyll-sass-converter!
BUNDLED WITH
1.17.3
1.17.1

View File

@ -1,93 +1,17 @@
# 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 grated 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 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.
This is a port of the current Wordpress version of the [CoTech Website][] to a statically-generated site using [Jekyll][].
## 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
@ -98,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
### 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.
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.
## Contributing

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More