Merge from upstream.

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-- 2.2.2
+- 2.5
 
 install: gem install jekyll jekyll-paginate jemoji html-proofer
 script: jekyll serve --baseurl "" --detach && htmlproofer ./_site --disable-external --empty-alt-ignore

README.md

@@ -1,4 +1,4 @@
-Quelldateien der Homepage unter [rolandjesse.de](http://rolandjesse.de/). Basiert auf dem [Personal Jekyll Theme](https://github.com/le4ker/personal-jekyll-theme/).
+Quelldateien der Homepage unter [rolandjesse.de](https://rolandjesse.de/). Basiert auf dem [Personal Jekyll Theme](https://github.com/le4ker/personal-jekyll-theme/).
 
 # Seite bauen
 
@@ -20,3 +20,31 @@ Seite mittels rsync (via scp) auf den Server laden (erfordert _deploy.yml mit de
 jekyll build
 octopress deploy
 ```
+
+Run using Docker:
+
+```
+docker run --rm -it -p 4000:4000 -v "$PWD:/srv/jekyll" jekyll/jekyll jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml
+```
+
+Run using Docker with Docker Compose:
+```
+docker-compose up
+```
+
+## OSS used in { Personal }
+
+One of the reasons { Personal } is real is the following OSS projects:
+
+  1. [Grayscale](http://startbootstrap.com/template-overviews/grayscale/)
+  2. [hammer.js](https://hammerjs.github.io/)
+  3. [highlightjs](https://highlightjs.org/)
+  4. [RRSSB](https://github.com/kni-labs/rrssb)
+  5. [Timeline](https://github.com/kirbyt/timeline-jekyll-theme)
+  6. [typed.js](https://github.com/mattboldt/typed.js/)
+
+<div style="font-size:16px;margin:0 auto;width:300px">
+    <a href="https://blockchain.info/address/1LHuKC9Em3KA5yoZaf7nngnNdf9K7s2gSi">
+        <img src="https://blockchain.info/Resources/buttons/donate_64.png"/>
+    </a>
+</div>

_config.dev.yml

@@ -0,0 +1 @@
+baseurl: ""

_config.yml

@@ -3,7 +3,7 @@
 
 # NB! Set your site's url, otherwise stuff will break :)
 
-url: "http://rolandjesse.de"
+url: "https://rolandjesse.de"
 
 # If you're hosting your site at a Project repository on GitHub pages
 # (https://yourusername.github.io/repository-name)
@@ -24,7 +24,7 @@ google-tracking-id: ""
 # If you are not hosted on Github Pages, and your host doesn't support https
 # then you should disable it
 
-force-https: False
+force-https: True
 
 #############
 # HTML Head #
@@ -137,7 +137,7 @@ events:
   - image: "/img/timeline/angestellter.jpg"
     date: "Angestellter"
     description: "Projektschaffender bei einer [Unternehmensberatung](https://www.pta.de/).<br />(Bild &copy; [Oskar Steimel](http://oskarsteimel.com/))"
-  - image: "/img/timeline/laeufer.jpg"
+  - image: "/img/timeligit remote add origin https://git.tailorama.com/sr-rolando/rolandjesse.de.gitne/laeufer.jpg"
     date: "Läufer"
     description: "Gern und viel unterwegs. Oft im Wald. Gelegentlich auf [Veranstaltungen](http://sr-rolando.com/laeufer/). Dann im sportlichen Kilt."
   - image: "/img/timeline/podcast.jpg"

docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3"
+
+services:
+  jekyll:
+    image: jekyll/jekyll
+    ports:
+      - "4000:4000"
+    command: jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml
+    volumes:
+      - .:/srv/jekyll
+

scripts/serve

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-jekyll serve --watch --host "127.0.0.1" --baseurl ""
+jekyll serve --watch --host "127.0.0.1" --config _config.yml,_config.dev.yml