From d2442d107a03c0acdb8f175370a12a007d6cbdf1 Mon Sep 17 00:00:00 2001
From: Heds Simons <heds@whaleway.net>
Date: Tue, 13 Mar 2018 11:41:06 +0000
Subject: [PATCH 1/2] Add ability to use self-signed CAs passed via
 `config.json`.

Connects-to: #601
Change-type: minor
---
 entry.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/entry.sh b/entry.sh
index 722634f8..877385d1 100755
--- a/entry.sh
+++ b/entry.sh
@@ -23,4 +23,13 @@ fi
 
 export DBUS_SYSTEM_BUS_ADDRESS="unix:path=/mnt/root/run/dbus/system_bus_socket"
 
+# Include self-signed CAs, should they exist
+if [ ! -z "${BALENA_ROOT_CA}" ]; then
+	if [ ! -e '/etc/ssl/certs/balenaRootCA.pem' ]; then
+		mkdir -p /usr/local/share/ca-certificates
+		echo "${BALENA_ROOT_CA}" > /usr/local/share/ca-certificates/balenaRootCA.crt
+		update-ca-certificates
+	fi
+fi
+
 exec node /usr/src/app/dist/app.js

From 4685612a3b608a44cab48805e4a4dab682e4323c Mon Sep 17 00:00:00 2001
From: "resin-io-versionbot[bot]"
 <resin-io-versionbot[bot]@users.noreply.github.com>
Date: Wed, 11 Apr 2018 16:13:53 +0000
Subject: [PATCH 2/2] v7.4.0

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d97d3aef..8ade0623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v7.4.0 - 2018-04-11
+
+* Add ability to use self-signed CAs passed via `config.json`. #602 [Heds Simons]
+
 ## v7.3.0 - 2018-04-10
 
 * Move to Node 6.13.1. #624 [Heds Simons]
diff --git a/package.json b/package.json
index d6cee640..268aa6e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",