diff --git a/.gitignore b/.gitignore index b103c72c..6782763d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ static/mptt/ static/rest_framework/ static/drf-yasg cms/local_settings.py -deploy/docker/local_settings.py +config/local_settings.py yt.readme.md /frontend-tools/video-editor/node_modules /frontend-tools/video-editor/client/node_modules diff --git a/Dockerfile b/Dockerfile index a889889b..497c2731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,8 +91,8 @@ WORKDIR /home/mediacms.io/mediacms # Copy imagemagick policy for sprite thumbnail generation COPY config/imagemagick/policy.xml /etc/ImageMagick-6/policy.xml -# Copy local_settings.py from deploy/docker to cms/ for default Docker config -RUN cp deploy/docker/local_settings.py cms/local_settings.py +# Copy local_settings.py from config to cms/ for default Docker config (if exists) +RUN cp config/local_settings.py cms/local_settings.py 2>/dev/null || true # Create www-data user directories and set permissions RUN mkdir -p /var/run/mediacms && \ diff --git a/deic_setup_notes.md b/deic_setup_notes.md index fed22006..cc4abdc2 100644 --- a/deic_setup_notes.md +++ b/deic_setup_notes.md @@ -1,7 +1,7 @@ # MediaCMS: Document Changes for DEIC ## Configuration Changes -The following changes are required in `deploy/docker/local_settings.py`: +The following changes are required in `config/local_settings.py`: ```python diff --git a/docs/saml_entraid_setup.md b/docs/saml_entraid_setup.md index e61a1a14..25275f5a 100644 --- a/docs/saml_entraid_setup.md +++ b/docs/saml_entraid_setup.md @@ -46,7 +46,7 @@ Before beginning, ensure the following: ## Step 1: Configure MediaCMS for SAML -The first step in enabling SAML authentication is to modify the `local_settings.py` (for Docker: `./deploy/docker/local_settings.py`) file of your MediaCMS deployment. Add the following configuration block to enable SAML support, role-based access control (RBAC), and enforce secure communication settings: +The first step in enabling SAML authentication is to modify the `local_settings.py` (for Docker: `./config/local_settings.py`) file of your MediaCMS deployment. Add the following configuration block to enable SAML support, role-based access control (RBAC), and enforce secure communication settings: ```python USE_RBAC = True @@ -292,7 +292,7 @@ Another issue you might encounter is an **infinite redirect loop**. This can hap https:///accounts/saml/mediacms_entraid/login/ ``` -* Add the following line to `./deploy/docker/local_settings.py`: +* Add the following line to `./config/local_settings.py`: ```python LOGIN_URL = "/accounts/saml/mediacms_entraid/login/"