Compare commits

...

3 commits

Author SHA1 Message Date
Jeppe Ernst 9fdd1c77f8 create deployment Docker config 2018-04-17 19:31:14 +02:00
Jeppe Ernst ca525b66af more indentation fails 2018-04-17 19:24:01 +02:00
Jeppe Ernst 78cd93cee8 remove Rasmus's crap 💩 2018-04-17 19:15:59 +02:00
6 changed files with 34 additions and 1 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
_site _site
.sass-cache .sass-cache
.jekyll-metadata .jekyll-metadata
_scripts/config.sh

View file

@ -6,6 +6,9 @@
You need docker-compose. Simply run You need docker-compose. Simply run
`docker-compose up` to launch the site in a docker container with livereload support. `docker-compose up` to launch the site in a docker container with livereload support.
## Deploy to FTP with Docker
Make sure that you have created a file in `_scripts/` called `config.sh`, protip: just duplicate the `config-example.sh` file, and set the correct values, you should only need to change username and password. Then you can build the site ande deploy if by running `docker-compose -f docker-compose-deploy.yml up`
### Or install Jekyll locally ### Or install Jekyll locally
#### Install Jekyll and Bundler gems through RubyGems #### Install Jekyll and Bundler gems through RubyGems

View file

@ -61,7 +61,7 @@ sections:
Honouring human rights does not leave the police blind as bats. Crime could be solved before 2006, but the police have to think for themselves. Who might be a suspect and why? It will still be possible to conduct surveillance, but only with sufficient democratic oversight. Honouring human rights does not leave the police blind as bats. Crime could be solved before 2006, but the police have to think for themselves. Who might be a suspect and why? It will still be possible to conduct surveillance, but only with sufficient democratic oversight.
- heading: Who's behind this? - heading: Who's behind this?
content: | content: |
* Human rights jurist [Rasmus Malver](https://twitter.com/rasmusmalver) kickstarted the fundraising with a contribution of 30.000 DKK, and the second large donor is [Bitbureauet](https://bitbureauet.dk/). In January the movement gained traction and today 100s of people, businesses and organisation have donated. An organisation was created to hold the money, and it will all be used to pay the legal fees. Human rights jurist [Rasmus Malver](https://twitter.com/rasmusmalver) kickstarted the fundraising with a contribution of 30.000 DKK, and the second large donor is [Bitbureauet](https://bitbureauet.dk/). In January the movement gained traction and today 100s of people, businesses and organisation have donated. An organisation was created to hold the money, and it will all be used to pay the legal fees.
We have chosen IT- og EU-specialists [Bird & Bird](https://www.twobirds.com), and advokat Martin von Haller leads the team. We have chosen IT- og EU-specialists [Bird & Bird](https://www.twobirds.com), and advokat Martin von Haller leads the team.
- heading: What is the relationship to human rights? - heading: What is the relationship to human rights?

View file

@ -0,0 +1,13 @@
#!/bin/sh
set -e
#get config vars
source _scripts/config.sh
#Disable SSL check for lftp, this fails on our host :(
echo "set ssl:verify-certificate no" > ~/.lftprc
if [ -d "$jekyll_dir" ]; then
jekyll build
lftp -u ${remote_username},${remote_password} -e "mirror -R -p -P=10 --ignore-time -v ${jekyll_dir}/_site/ ${remote_dir};quit" ftp://${remote_host}
fi

View file

@ -0,0 +1,8 @@
#!/bin/sh
jekyll_dir="/srv/jekyll"
remote_host="ulovliglogning.dk"
remote_dir="/"
remote_username="username"
remote_password="SUPERSECRETPASSWORD"

View file

@ -0,0 +1,8 @@
jekyll:
image: jekyll/builder
command: sh /srv/jekyll/_scripts/build-then-deploy.sh
ports:
- 4000:4000
volumes:
- .:/srv/jekyll