Merge pull request #64 from mr-ssd/fix-wrong-pi-config-dir

fix wrong default pi.cfg location

Dockerfile

@@ -9,15 +9,16 @@ RUN install_packages ca-certificates git supervisor gettext-base nginx
 
 # Create directories and user for PrivacyIdea and set ownership
 RUN mkdir -p /data/privacyidea/keys \
-    /var/log/privacyidea && \
+    /var/log/privacyidea \
+    /etc/privacyidea && \
     adduser --gecos "PrivacyIdea User" \
     --disabled-password \
     --home /home/privacyidea \
     --uid 1001 \
     privacyidea && \
     addgroup privacyidea privacyidea && \
     usermod -g 1001 privacyidea && \
-    chown -R privacyidea:privacyidea /var/log/privacyidea /data/privacyidea
+    chown -R privacyidea:privacyidea /var/log/privacyidea /data/privacyidea /etc/privacyidea
 
 # Set environment variables for uWSGI and Nginx
 ENV UWSGI_INI=/etc/uwsgi/uwsgi.ini \

rootfs/usr/local/bin/start_privacyidea.sh

@@ -61,14 +61,14 @@ function generate_pi_config {
     fi
 
     # Check if the configuration file already exists
-    if [ ! -f /data/privacyidea/pi.cfg ]; then
+    if [ ! -f /etc/privacyidea/pi.cfg ]; then
 
         # Check if SQLALCHEMY_DATABASE_URI is defined
         if [ -z "$SQLALCHEMY_DATABASE_URI" ]; then
             echo "SQLALCHEMY_DATABASE_URI is undefined"
         else
             # Use the pi-config.template file as a template and substitute the necessary variables
-            envsubst < /opt/templates/pi-config.template > /data/privacyidea/pi.cfg
+            envsubst < /opt/templates/pi-config.template > /etc/privacyidea/pi.cfg
         fi
     fi