From 66ed50404a6215851a80607cdca1d378c923b61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Tue, 15 May 2018 14:42:45 +0200
Subject: Fix OpenSSL-1.0 for BuildKite

---
 archlinux.sh | 1 +
 ci.d/openssl | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/archlinux.sh b/archlinux.sh
index 1aa8a59..fc783a1 100755
--- a/archlinux.sh
+++ b/archlinux.sh
@@ -22,5 +22,6 @@ pacman_install $PACKAGES
 openssl_fix_10
 archlinux_enable_cron
 buildkite_install $DIST $BUILDKITE_TOKEN
+openssl_fix_10_buildkite
 ssh_copy_host_key
 lxc_restart
diff --git a/ci.d/openssl b/ci.d/openssl
index e08397b..139c595 100644
--- a/ci.d/openssl
+++ b/ci.d/openssl
@@ -4,13 +4,18 @@
 #
 # Setup OpenSSL 1.0 for older Erlang versions.
 openssl_fix_10() {
-	BUILDKITE_PATH=/root/.buildkite-agent
 	lxc_do mkdir /root/openssl-1.0
 	lxc_do ln -s /usr/include/openssl-1.0 /root/openssl-1.0/include
 	lxc_do ln -s /usr/lib/openssl-1.0 /root/openssl-1.0/lib
 	echo "lxc.environment = KERL_CONFIGURE_OPTIONS=--with-ssl=/root/openssl-1.0" \
 		>> /home/lxc/$NAME/config
-	# Also install a BuildKite hook setting this environment value.
+}
+
+# openssl_fix_10_buildkite
+#
+# Setup OpenSSL 1.0 also in Buildkite.
+openssl_fix_10_buildkite() {
+	BUILDKITE_PATH=/root/.buildkite-agent
 	<$( cd "$( dirname "$0" )" && pwd )/priv/buildkite-environment-hook-openssl-fix-10 \
 		lxc_do bash -c "cat > $BUILDKITE_PATH/hooks/environment"
 	lxc_do chmod +x $BUILDKITE_PATH/hooks/environment
-- 
cgit v1.2.3