Simplify and fix perms for radius

This commit is contained in:
kjeld Schouten-Lebbing
2021-07-07 00:31:11 +02:00
parent df0f995512
commit 6b8670acca
5 changed files with 34 additions and 3 deletions
-2
View File
@@ -8,8 +8,6 @@ VOLUME /config
# hadolint ignore=DL3008,DL3015,SC2086,SC2155 # hadolint ignore=DL3008,DL3015,SC2086,SC2155
RUN \ RUN \
mkdir -p /defaults/raddb/ && \
cp -Rf /etc/raddb/* /defaults/raddb/ && \
rm /docker-entrypoint.sh && \ rm /docker-entrypoint.sh && \
rm -Rf /etc/raddb && \ rm -Rf /etc/raddb && \
ln -s /config /etc/raddb ln -s /config /etc/raddb
+33
View File
@@ -0,0 +1,33 @@
#!/bin/sh
set -e
if [ -f "/config/clients.conf" ]; then
echo "Radius config already exists, skipping config copy..."
else
echo "Radius config does not exist, copying..."
cp -Rf /defaults/raddb/* /config/
fi
chown -R freerad:freerad /config
# this if will check if the first argument is a flag
# but only works if all arguments require a hyphenated flag
# -v; -SL; -f arg; etc will work, but not arg1 arg2
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
set -- freeradius "$@"
fi
# check for the expected command
if [ "$1" = 'freeradius' ]; then
shift
exec freeradius -f "$@"
fi
# many people are likely to call "radiusd" as well, so allow that
if [ "$1" = 'radiusd' ]; then
shift
exec freeradius -f "$@"
fi
# else default to run whatever the user wanted like "bash" or "sh"
exec "$@"
+1 -1
View File
@@ -5,7 +5,7 @@ if [ -f "/config/clients.conf" ]; then
echo "Radius config already exists, skipping config copy..." echo "Radius config already exists, skipping config copy..."
else else
echo "Radius config does not exist, copying..." echo "Radius config does not exist, copying..."
cp -Rf /defaults/raddb/* /config/ cp -Rf /etc/freeradius/* /config/
fi fi
chown -R freerad:freerad /config chown -R freerad:freerad /config
View File
View File