From f13d9648f0e49f04e704bfdfbbb4a983aacfb714 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Sat, 2 May 2020 11:25:57 +0200
Subject: [PATCH 1/3] use premade orb for installing aws cli

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 89a2fc5..a63cecb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,17 +1,14 @@
-version: 2
+version: 2.1
 
 jobs:
   deploy:
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
     working_directory: ~/offen
     steps:
       - checkout
       - setup_remote_docker
-      - run:
-          name: Install deployment dependencies
-          command: |
-            sudo pip install -q awscli --upgrade
+      - aws-cli/install
       - run:
           name: Build and deploy to S3
           command: |
@@ -42,3 +39,6 @@ workflows:
               only:
                 - master
                 - development
+
+orbs:
+  aws-cli: circleci/aws-cli@1.0.0

From 802249a33c1528cce4f2193e5df8971b72d759e9 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Sat, 2 May 2020 20:17:07 +0200
Subject: [PATCH 2/3] ensure better logical grouping of build steps

---
 .circleci/config.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a63cecb..adb824c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,22 +10,31 @@ jobs:
       - setup_remote_docker
       - aws-cli/install
       - run:
-          name: Build and deploy to S3
+          name: Set build environment depending on branch
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              export SITEURL="https://www.offen.dev"
-              export BUCKET="offen-dev-production"
-              export DISTRIBUTION="E2UP8XHLFOC3QC"
-              export ROBOTS_FILE="robots.txt.production"
-              export OFFEN_ACCOUNT_ID="5ec8345a-2a45-4eb9-92e5-8d9e5684db58"
+              cat >> $BASH_ENV \<< EOF
+            export SITEURL="https://www.offen.dev"
+            export BUCKET="offen-dev-production"
+            export DISTRIBUTION="E2UP8XHLFOC3QC"
+            export ROBOTS_FILE="robots.txt.production"
+            export OFFEN_ACCOUNT_ID="5ec8345a-2a45-4eb9-92e5-8d9e5684db58"
+            EOF
             else
-              export SITEURL="https://staging.offen.dev"
-              export BUCKET="offen-dev-staging"
-              export DISTRIBUTION="E13I20LK8ASYFH"
-              export ROBOTS_FILE="robots.txt.staging"
-              export OFFEN_ACCOUNT_ID="8f7ee44a-4cd8-47f2-a77e-8c7c98d46b89"
+              cat >> $BASH_ENV \<< EOF
+            export SITEURL="https://staging.offen.dev"
+            export BUCKET="offen-dev-staging"
+            export DISTRIBUTION="E13I20LK8ASYFH"
+            export ROBOTS_FILE="robots.txt.staging"
+            export OFFEN_ACCOUNT_ID="8f7ee44a-4cd8-47f2-a77e-8c7c98d46b89"
+            EOF
             fi
-            make build
+      - run:
+          name: Build
+          command: make build
+      - run:
+          name: Deploy to S3
+          command: |
             aws s3 sync --delete ./output/. s3://$BUCKET
             aws cloudfront create-invalidation --distribution-id $DISTRIBUTION --paths "/*"
 

From 50c060652e117ad8e804afbf5b0532fa9bf7b41d Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Tue, 5 May 2020 18:54:05 +0200
Subject: [PATCH 3/3] fix outdated links in deep dive

---
 homepage/content/pages/deep-dive.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md
index fc005d6..69bef23 100644
--- a/homepage/content/pages/deep-dive.md
+++ b/homepage/content/pages/deep-dive.md
@@ -59,10 +59,9 @@ At runtime, Offen is just mediating exchange between users and operators. Usage
 
 [^9]: Datensparsamkeit <https://martinfowler.com/bliki/Datensparsamkeit.html>
 
-The software itself, as well as *all the used tools are open source*, [project planning][pivotal-tracker]{: target="_blank"} and [technical specification][rfcs-repo]{: target="_blank"} take place in the open and actively solicit feedback from the general public. The infrastructure the service is deployed to is split into three isolated environments in order to minimize possible attack vectors.
+The software itself, as well as *all the used tools are open source*, [project planning and technical specification][github-org]{: target="_blank"} take place in the open and actively solicit feedback from the general public. The infrastructure the service is deployed to is split into three isolated environments in order to minimize possible attack vectors.
 
-[pivotal-tracker]: https://www.pivotaltracker.com/n/projects/2334535
-[rfcs-repo]: https://github.com/offen/rfcs
+[github-org]: https://github.com/offen
 
 Users and operators are given intuitive and accessibility-focused tools for analyzing and managing their data in the form of a web application and a browser extension. Operators deploy the service using a simple script tag. More sophisticated use cases are covered by a dedicated SDK.