From ba959771ed8c92722f6dd9d357858e8b5e114732 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 17 Jan 2020 11:40:27 +0100
Subject: [PATCH 1/3] ++stuff

---
 content/u/products/zero-carbon-cloud/contents.lr | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/u/products/zero-carbon-cloud/contents.lr b/content/u/products/zero-carbon-cloud/contents.lr
index 499d3d7..eac0a32 100644
--- a/content/u/products/zero-carbon-cloud/contents.lr
+++ b/content/u/products/zero-carbon-cloud/contents.lr
@@ -78,7 +78,7 @@ content2_image: /u/image/zerocarbon-no.jpg
 offer1_title: 100 GB @ 23CHF/month
 ---
 offer1_text:
-* Free IPv6 VPN for increased security
+* **One free IPv6 VPN** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access to only your devices
 
@@ -90,9 +90,10 @@ offer1_link: https://ungleich.ch
 offer2_title: 1 TB @ 36.5CHF/month
 ---
 offer2_text:
-* Free IPv6 VPN for increased security
+* **Two free IPv6 VPNs** included for increased security
 * Datacenter location: Glarus, Switzerland
-* Enhanced security by limiting access to only your devices
+* Enhanced security by limiting access
+Free IPv6 VPNto only your devices
 
 Recommended for small to medium organisations
 
@@ -102,7 +103,7 @@ offer2_link: https://ungleich.ch
 offer3_title: 50 TB @ 540 CHF/month
 ---
 offer3_text:
-* Free IPv6 VPN for increased security
+* **Ten free IPv VPNs** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access to only your devices
 * **30% large scale discount**

From 908979dac274d2e9db2e7791d84f92618a025331 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 17 Jan 2020 11:41:40 +0100
Subject: [PATCH 2/3] minus typos

---
 content/u/products/zero-carbon-cloud/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/u/products/zero-carbon-cloud/contents.lr b/content/u/products/zero-carbon-cloud/contents.lr
index 60ea3cc..902d515 100644
--- a/content/u/products/zero-carbon-cloud/contents.lr
+++ b/content/u/products/zero-carbon-cloud/contents.lr
@@ -105,7 +105,7 @@ offer2_link: https://ungleich.ch
 offer3_title: 50 TB @ 540 CHF/month
 ---
 offer3_text:
-* **Ten free IPv VPNs** included for increased security
+* **Ten free IPv6 VPNs** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access to only your devices
 * **30% large scale discount**

From e849682ab3f3ae398ee6de6d634eb275920ac96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Fri, 17 Jan 2020 21:19:12 +0100
Subject: [PATCH 3/3] Configure Gitlab CI for automatic deployment

---
 .gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++++++
 Makefile       |  7 +++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..6cced24
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,39 @@
+stages:
+  - build
+  - deploy
+
+image: debian:latest
+variables:
+  BUILDDIR: "build/"
+
+build:
+  stage: build
+  before_script:
+    - apt-get update
+    - apt-get install -y make lektor imagemagick
+  script:
+    - make build
+  artifacts:
+    expire_in: 12 hours
+    paths:
+      - "build/"
+
+deploy:
+  stage: deploy
+  only:
+    - master
+  environment:
+    name: production
+    url: https://ungleich.ch/
+  before_script:
+    # Install dependencies
+    - apt-get update
+    - apt-get install -y make openssh-client rsync
+    # Configure the SSH Agent
+    - eval $(ssh-agent -s)
+    - echo "$CD_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - echo "$CD_SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - make deploy
diff --git a/Makefile b/Makefile
index b9fd51b..60083d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-BUILDDIR=../ungleich-staticcms-build
+BUILDDIR?=../ungleich-staticcms-build
 DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
 
 all: publish
@@ -6,9 +6,12 @@ all: publish
 pull:
 	git pull
 
-publish: pull build permissions
+publish: pull build deploy
+
+deploy: permissions
 	rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION)
 	rsync -av --delete $(BUILDDIR)/sitemap.xml $(DESTINATION)
+
 permissions: build
 	find $(BUILDDIR) -type f -exec chmod 0644 {} \;
 	find $(BUILDDIR) -type d -exec chmod 0755 {} \;