forked from baron/baron-sso
Merge branch 'feature/worksmobile' into dev
This commit is contained in:
@@ -19,17 +19,15 @@ export RULES_FILE
|
||||
|
||||
echo "[oathkeeper] APP_ENV=$APP_ENV_VALUE rules=$RULES_FILE"
|
||||
|
||||
RULES_ACTIVE="/etc/config/oathkeeper/rules.active.json"
|
||||
RUNTIME_DIR="/tmp/oathkeeper"
|
||||
RULES_ACTIVE="${RUNTIME_DIR}/rules.active.json"
|
||||
if [ ! -f "$RULES_FILE" ]; then
|
||||
echo "[oathkeeper] rules file not found: $RULES_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remove existing active rules file to prevent overwrite issues (File exists/Permission denied)
|
||||
if [ -f "$RULES_ACTIVE" ]; then
|
||||
rm -f "$RULES_ACTIVE" || echo "[oathkeeper] Warning: Failed to remove existing rules.active.json"
|
||||
fi
|
||||
cp -f "$RULES_FILE" "$RULES_ACTIVE" || echo "[oathkeeper] Warning: Failed to copy rules file. Using existing if present."
|
||||
mkdir -p "$RUNTIME_DIR"
|
||||
cp -f "$RULES_FILE" "$RULES_ACTIVE"
|
||||
|
||||
LOG_DIR="/var/log/oathkeeper"
|
||||
LOG_FILE="${LOG_DIR}/access.log"
|
||||
@@ -41,7 +39,7 @@ if ! touch "$LOG_FILE" 2>/dev/null; then
|
||||
fi
|
||||
|
||||
if [ -n "$LOG_FILE" ]; then
|
||||
exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml 2>&1 | tee \"$LOG_FILE\""
|
||||
exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml 2>&1 | tee -a \"$LOG_FILE\""
|
||||
fi
|
||||
|
||||
exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml"
|
||||
|
||||
@@ -14,7 +14,7 @@ errors:
|
||||
|
||||
access_rules:
|
||||
repositories:
|
||||
- file:///etc/config/oathkeeper/rules.active.json
|
||||
- file:///tmp/oathkeeper/rules.active.json
|
||||
|
||||
authenticators:
|
||||
noop:
|
||||
|
||||
Reference in New Issue
Block a user