From c8c92bd5f32d976ef02dd7455f856f520e363ad3 Mon Sep 17 00:00:00 2001
From: "Brown, Joshua" <brownjs@ornl.gov>
Date: Wed, 21 Feb 2024 10:18:50 -0500
Subject: [PATCH] Fix CI web cert place in file

---
 .gitlab-ci.yml                | 25 +------------------------
 scripts/ci_setup_web_certs.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100755 scripts/ci_setup_web_certs.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb1522576..01adec1c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -419,30 +419,7 @@ end-to-end-ws-setup:
     - echo "$BRANCH_LOWER"
     - mkdir -p "$HOST_LOG_FILE_PATH"
     - mkdir -p "${DATAFED_WEB_KEY_DIR}"
-    - >
-      if [ ! -e "$DATAFED_WEB_CERT_PATH" ] || [ ! -e "$DATAFED_WEB_KEY_PATH" ]
-      then
-        if [ -e "$DATAFED_WEB_CERT_PATH" ]
-        then
-          rm "${DATAFED_WEB_CERT_PATH}"
-        fi
-        if [ -e "$DATAFED_WEB_KEY_PATH" ]
-        then
-          rm "${DATAFED_WEB_KEY_PATH}"
-        fi
-        if [ -e "$DATAFED_WEB_CSR_PATH" ]
-        then
-          rm "${DATAFED_WEB_CSR_PATH}"
-        fi
-        openssl genrsa -out "$DATAFED_WEB_KEY_PATH" 2048
-        openssl req -new -key "$DATAFED_WEB_KEY_PATH" \
-          -out "${DATAFED_WEB_CSR_PATH}" \
-          -subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${DI_DATAFED_DOMAIN}"
-        openssl x509 -req -days 3650 \
-           -in "${DATAFED_WEB_CSR_PATH}" \
-           -signkey "$DATAFED_WEB_KEY_PATH" \
-           -out "$DATAFED_WEB_CERT_PATH"
-      fi
+    - ./scripts/ci_setup_web_certs.sh
     - chmod o+w "${HOST_LOG_FILE_PATH}"
     - chown gitlab-runner "$HOST_LOG_FILE_PATH"
     - ./scripts/generate_datafed.sh
diff --git a/scripts/ci_setup_web_certs.sh b/scripts/ci_setup_web_certs.sh
new file mode 100755
index 000000000..aa7c1f8db
--- /dev/null
+++ b/scripts/ci_setup_web_certs.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [ ! -e "$DATAFED_WEB_CERT_PATH" ] || [ ! -e "$DATAFED_WEB_KEY_PATH" ]
+then
+  if [ -e "$DATAFED_WEB_CERT_PATH" ]
+  then
+    rm "${DATAFED_WEB_CERT_PATH}"
+  fi
+  if [ -e "$DATAFED_WEB_KEY_PATH" ]
+  then
+    rm "${DATAFED_WEB_KEY_PATH}"
+  fi
+  if [ -e "$DATAFED_WEB_CSR_PATH" ]
+  then
+    rm "${DATAFED_WEB_CSR_PATH}"
+  fi
+  openssl genrsa -out "$DATAFED_WEB_KEY_PATH" 2048
+  openssl req -new -key "$DATAFED_WEB_KEY_PATH" \
+    -out "${DATAFED_WEB_CSR_PATH}" \
+    -subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${DI_DATAFED_DOMAIN}"
+  openssl x509 -req -days 3650 \
+     -in "${DATAFED_WEB_CSR_PATH}" \
+     -signkey "$DATAFED_WEB_KEY_PATH" \
+     -out "$DATAFED_WEB_CERT_PATH"
+fi
+