Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms

.gitlab-ci.yml

@@ -2,15 +2,12 @@ stages:
   - build
   - deploy
 
-image: debian:latest
+image: registry.gitlab.com/fnux/ungleich-images/staticcms-ci:latest
 variables:
   BUILDDIR: "build/"
 
 build:
   stage: build
-  before_script:
-    - apt-get update
-    - apt-get install -y make lektor imagemagick
   script:
     - make build
   artifacts:
@@ -26,9 +23,6 @@ deploy:
     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

Dockerfile

@@ -0,0 +1,7 @@
+# This image used for CI.
+
+FROM debian:latest
+MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
+
+RUN apt-get update
+RUN apt-get install -y make lektor imagemagick openssh-client rsync

content/u/deals/valentine-machine-2020/contents.lr

@@ -28,7 +28,7 @@ description1:
 
 ## Valentine Machines
 
-Imagine this: instead of the conventional presents we've all seen over and over, give your
+Imagine this: instead of the conventional gifts we've all seen over and over, giving your
 beloved geek something creative. Something that they can enjoy even after the Valentine's day. And save the planet in the meantime.
 
 <img src="/u/image/valentine-machine.jpg" class="img-fluid">
@@ -41,12 +41,11 @@ All VMs from ungleich are fully **zero carbon**. No CO2 emissions from running a
 ## 14% discount on valentine machines
 
 To make it easier to give a cool VM to your beloved one, we give you a
-14% discount on any VM that you buy on [IPv6Onlyhosting.com]
-(https://ipv6onlyhosting.com) or
+14% discount on any VM that you buy on [IPv6Onlyhosting.com](https://ipv6onlyhosting.com) or
 [DataCenterLight.ch](https://datacenterlight.ch) from 2020-02-07 to 2020-02-14.
 
 ## How to get 14% discount
 
-Order a VM during the Valentine Machine week 2020-02-07 to 2020-02-14 and go through the checkout, and send us the following message to support@datacenterlight.ch
+Order a VM during the Valentine Machine week 2020-02-07 to 2020-02-14 and go through the checkout, and send us the following message to vm@zerocarbon.shop
 "I want a zero carbon Valentine's day!"
 As soon as our team checks your message, we will apply the discount for your VM subscription.

content/u/products/hosted-matrix-chat/contents.lr

@@ -170,10 +170,10 @@ on our <a href="https://redmine.ungleich.ch/projects/open-infrastructure/wiki/Un
 </p>
 
 <div class="alert alert-secondary">
-You might be also interested in our [Mattermost-based chat
-offer](../zero-carbon-chat), which might be closer to what you expect for a
-enterprise team chat at the moment. We use both at ungleich, since Matrix is
-especially convenient to reach out to the world!
+You might be also interested in our <a
+href="../zero-carbon-chat">Mattermost-based chat offer</a>, which might be
+closer to what you expect for a enterprise team chat at the moment. We use both
+at ungleich, since Matrix is especially convenient to reach out to the world!
 </div>
 
 ---