add spacing under introduction

This commit is contained in:
Oly 2017-02-06 14:10:35 +00:00
parent b55e16009d
commit 0d538df97e
2 changed files with 24 additions and 8 deletions

View File

@ -1,5 +1,6 @@
pipeline:
backend:
build: ./compose/django/Dockerfile
image: maidstonehackspacewebsite_django
environment:
- POSTGRES_USER=mhackspace
@ -7,9 +8,9 @@ pipeline:
- DJANGO_SETTINGS_MODULE=config.settings.test
commands:
- cp -n env.example .env
- pip install -r /requirements/test.txt
- python manage.py test mhackspace --verbosity 2
deploy:
@ -20,6 +21,9 @@ pipeline:
services:
postgres:
build: ./compose/postgres
# build:
# context: .
# dockerfile: ./compose/django/Dockerfile
# volumes:
# - postgres_data_dev:/var/lib/postgresql/data
# - postgres_backup_dev:/backups
@ -47,10 +51,22 @@ services:
mailhog:
image: mailhog/mailhog
# deploy:
# ssh:
# target: test.maidstone-hackspace.org.uk:/var/www/test-maidstone-hackspace.org.uk 22
# artifacts:
# - build.result
# - config/file
# cmd: /opt/bin/redeploy.sh
deploy:
ssh:
target: test.maidstone-hackspace.org.uk:/var/www/test-maidstone-hackspace.org.uk 22
artifacts:
- build.result
- config/file
cmd: /opt/bin/redeploy.sh
host: maidstone-hackspace-stage
port: 22
commands:
- cd /var/www/stage/maidstone-hackspace-website/
- docker-compose -fstage.yml build
- docker-compose -fstage.yml down --remove-orphans
- docker-compose -fstage.yml up
when:
branch: master

View File

@ -3,7 +3,7 @@
{% block content %}
<h2>Introduction</h2>
Hackspaces are a shared space where artists, designers, makers, hackers, programmers, tinkerers, professionals and hobbyists can work on their projects, share knowledge and collaborate.We are in the process of developing Maidstone Hackspace. We're previous members of (ICMP) and looking to form a new space in the future. At the moment, communication is via google groups, email, and the website. If you're at all intrested please join our mailing list and make yourself known!
<p>Hackspaces are a shared space where artists, designers, makers, hackers, programmers, tinkerers, professionals and hobbyists can work on their projects, share knowledge and collaborate.We are in the process of developing Maidstone Hackspace. We're previous members of (ICMP) and looking to form a new space in the future. At the moment, communication is via google groups, email, and the website. If you're at all intrested please join our mailing list and make yourself known!</p>
{% show_feeds %}
{% endblock content %}