From 10f073dd3754cfb04731263289ba38dbf4e0a818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Str=C3=B6mb=C3=A4ck?= <filip.stromback@liu.se>
Date: Fri, 22 Jan 2021 11:25:51 +0100
Subject: [PATCH] Updated the Boost version used with the broker and auth
server to 1.69.
---
files/auth/on_update.sh | 5 +++++
files/broker/on_update.sh | 5 +++++
manifests/broker.pp | 9 +++------
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/files/auth/on_update.sh b/files/auth/on_update.sh
index 4ee42b7..7a13654 100644
--- a/files/auth/on_update.sh
+++ b/files/auth/on_update.sh
@@ -4,6 +4,11 @@ run_as_broker=$(cat <<'EOF'
cd
# To make sure we have a decent GCC in our path.
source /opt/rh/devtoolset-7/enable
+
+# Use a newer Boost.
+export LIBRARY_PATH=/usr/lib64/boost169
+export CPATH=/usr/include/boost169
+
cd src/auth
make clean
make -j4
diff --git a/files/broker/on_update.sh b/files/broker/on_update.sh
index 433cee0..1e6a62c 100644
--- a/files/broker/on_update.sh
+++ b/files/broker/on_update.sh
@@ -4,6 +4,11 @@ run_as_broker=$(cat <<'EOF'
cd
# To make sure we have a decent GCC in our path.
source /opt/rh/devtoolset-7/enable
+
+# Use a newer Boost.
+export LIBRARY_PATH=/usr/lib64/boost169
+export CPATH=/usr/include/boost169
+
cd src/broker
make clean
make -j4
diff --git a/manifests/broker.pp b/manifests/broker.pp
index bd8891b..15fbfd0 100644
--- a/manifests/broker.pp
+++ b/manifests/broker.pp
@@ -5,15 +5,12 @@ class aes::broker {
$broker_home = "/srv/${broker_user}"
$broker_service = "aes_broker"
- # Sadly, it does not seem like we can only install asio, so we need
+ # Sadly, it does not seem like we can not only install asio, so we need
# to install the Boost as a whole.
- # It is easiest to install just "boost", even if that is a bit older
- # than what is available (others require modifying the include path).
- # It is still enough for the broker.
package {
[
- 'boost',
- 'boost-devel',
+ 'boost169',
+ 'boost169-devel',
]:
ensure => installed,
}
--
GitLab