Skip to content

refactor #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffreyaven merged 1 commit into from
Jan 8, 2024
Merged

refactor #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
#!/bin/bash

# Set directory paths
# CERT_DIR="/opt/stackql/srv/credentials"
# External volume directory
EXT_VOL_CERT_DIR="/opt/stackql/srv/credentials"
# Fallback local directory
LOCAL_CERT_DIR="/usr/local/certs"
# Directory to hold certificates
CERT_DIR=""

CERT_DIR="/tmp"
# Function to check and set the CERT_DIR
set_cert_dir() {
# Check if external volume directory is accessible
if [ -d "$EXT_VOL_CERT_DIR" ] && [ -w "$EXT_VOL_CERT_DIR" ]; then
echo "Using external volume for certificates."
CERT_DIR="$EXT_VOL_CERT_DIR"
else
echo "External volume is not accessible. Using local directory for certificates."
# Create local directory if it does not exist
mkdir -p "$LOCAL_CERT_DIR"
CERT_DIR="$LOCAL_CERT_DIR"
fi
}

# Check if certificates and keys are present in the environment variables or the directory
check_certs_and_keys() {
Expand All @@ -30,6 +46,7 @@ check_certs_and_keys() {
start_stackql() {
if [ "$SECURE_MODE" = "true" ]; then
echo "Running with mTLS..."
set_cert_dir
check_certs_and_keys
CLIENT_CA_ENCODED=$(base64 -w 0 "$CERT_DIR/client_cert.pem")
# Start the server with TLS configuration
Expand All @@ -42,7 +59,6 @@ start_stackql() {
\"clientCAs\": [\"$CLIENT_CA_ENCODED\"] \
}"
else
# Start the server without TLS configuration
echo "Running without mTLS..."
/srv/stackql/stackql srv --approot=/srv/stackql/.stackql \
--pgsrv.port=$PGSRV_PORT \
Expand Down