Skip to content

Commit 9c5e8a1

Browse files
fixes
1 parent e6d3af1 commit 9c5e8a1

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

.github/FUNDING.YML

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ko_fi: fabiograsso
2+
custom: ["https://revolut.me/fabiograsso"]

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-include .env
33
export
44

5-
.PHONY: help start start-logs stop stop-logs restart restart-logs logs build configure radius-test test check-prereqs
5+
.PHONY: help start start-logs stop stop-logs restart restart-logs start-live logs build configure radius-test test check-prereqs
66

77
help:
88
@echo "Usage: make [target]"
@@ -27,7 +27,7 @@ start: check-prereqs
2727
@echo "--> Starting containers in detached mode..."
2828
@docker compose up -d
2929

30-
star-live: check-prereqs
30+
start-live: check-prereqs
3131
@echo "--> Starting containers in detached mode..."
3232
@docker compose up
3333

@@ -63,6 +63,7 @@ kill:
6363

6464
configure:
6565
@echo "--> Launching Okta agent configuration script..."
66+
@docker compose up -d okta-radius-agent
6667
@docker compose exec okta-radius-agent /bin/bash -c "source /opt/okta/ragent/scripts/configure.sh"
6768

6869
radius-test:
@@ -73,13 +74,13 @@ test: radius-test
7374

7475
check-prereqs:
7576
@echo "--> Checking prerequisites..."
76-
@# 1. Check deb file
77-
@if ! ls ./docker/okta-radius-agent/package/OktaRadiusAgentSetup-*.deb 1>/dev/null 2>&1; then \
78-
echo "\033[0;31mERROR: Okta RADIUS Agent installer (.deb) not found!\033[0m"; \
79-
echo "Please place the downloaded agent file in the './docker/okta-radius-agent/package/' directory."; \
77+
@# 1. Check deb file OR DEB_URL
78+
@if ! ls ./docker/okta-radius-agent/package/OktaRadiusAgentSetup-*.deb 1>/dev/null 2>&1 && [ -z "$$DEB_URL" ]; then \
79+
echo "\033[0;31mERROR: Okta RADIUS Agent installer (.deb) not found and DEB_URL is not set!\033[0m"; \
80+
echo "Please place the downloaded agent file in the './docker/okta-radius-agent/package/' directory or set the DEB_URL environment variable."; \
8081
exit 1; \
8182
fi
82-
@echo " [✔] Okta RADIUS Agent installer found."
83+
@echo " [✔] Okta RADIUS Agent installer found or DEB_URL is set."
8384
@# 2. Check that specific required variables are not empty
8485
@for var in OKTA_ORG RADIUS_SECRET OPENVPN_PASSWORD; do \
8586
if [ -z "$${!var}" ]; then \

docker/okta-radius-agent/entrypoint.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CONFIG="/opt/okta/ragent/user/config/radius/config.properties"
1616
LOGFILE="/opt/okta/ragent/logs/okta_radius.log"
1717
LOG4J="/opt/okta/ragent/user/config/radius/log4j2.xml"
1818
DEFCONFDIR="/usr/local/share/okta_radius_defaults/"
19+
CONFIG_ADDITIONAL="/var/lib/ragent/additional-config.properties"
1920

2021
# If config files don't exist, copy them
2122
if [ ! -f "$CONFIG" ]; then
@@ -30,6 +31,12 @@ if [ ! -f "$LOG4J" ]; then
3031
chown OktaRadiusService:OktaRadiusService "$LOG4J"
3132
fi
3233

34+
if [ ! -f "$CONFIG_ADDITIONAL" ]; then
35+
echo "Missing additional-config.properties. Creating..."
36+
touch $CONFIG_ADDITIONAL
37+
chown OktaRadiusService:OktaRadiusService "$CONFIG_ADDITIONAL"
38+
fi
39+
3340
# Trap termination signals to properly stop Java when container stops
3441
trap 'echo "Stopping RADIUS agent..."; kill $JAVA_PID; wait $JAVA_PID' SIGTERM SIGINT
3542

0 commit comments

Comments
 (0)