summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xintegration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates11
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates11
-rw-r--r--integration/scripts/files/trove-guest.upstart.conf4
3 files changed, 25 insertions, 1 deletions
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates b/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates
new file mode 100755
index 0000000..8ef6c50
--- /dev/null
+++ b/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates
@@ -0,0 +1,11 @@
1#!/bin/sh
2
3# CONTEXT: GUEST during CONSTRUCTION as ROOT
4# PURPOSE: configure trove-guest service to use system store of trusted certificates
5
6GUEST_UNIT_DROPINS="/etc/systemd/system/trove-guest.service.d"
7
8mkdir -v -p ${GUEST_UNIT_DROPINS}
9echo -e '[Service]\nEnvironment=REQUESTS_CA_BUNDLE=/etc/pki/tls/certs' > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf
10
11
diff --git a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates
new file mode 100755
index 0000000..ab9469e
--- /dev/null
+++ b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates
@@ -0,0 +1,11 @@
1#!/bin/sh
2
3# CONTEXT: GUEST during CONSTRUCTION as ROOT
4# PURPOSE: configure trove-guest service to use system store of trusted certificates
5
6GUEST_UNIT_DROPINS="/etc/systemd/system/trove-guest.service.d"
7
8mkdir -v -p ${GUEST_UNIT_DROPINS}
9echo -e '[Service]\nEnvironment=REQUESTS_CA_BUNDLE=/etc/ssl/certs' > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf
10
11
diff --git a/integration/scripts/files/trove-guest.upstart.conf b/integration/scripts/files/trove-guest.upstart.conf
index 2e20d6c..f6a3dba 100644
--- a/integration/scripts/files/trove-guest.upstart.conf
+++ b/integration/scripts/files/trove-guest.upstart.conf
@@ -36,5 +36,7 @@ script
36 36
37 fi 37 fi
38 38
39 exec su -c "/home/GUEST_USERNAME/trove/contrib/trove-guestagent $TROVE_CONFIG" GUEST_USERNAME 39 # Requests: CA directories not supported in older Pythons, a custom bundle file is needed
40 cat /usr/local/share/ca-certificates/*.crt > /usr/local/share/ca-certificates/custom.bundle
41 exec su -c "REQUESTS_CA_BUNDLE=/usr/local/share/ca-certificates/custom.bundle /home/GUEST_USERNAME/trove/contrib/trove-guestagent $TROVE_CONFIG" GUEST_USERNAME
40end script 42end script