diff --git a/Dockerfile.centos7 b/Dockerfile.centos7 index c6ef455a..5d95712e 100755 --- a/Dockerfile.centos7 +++ b/Dockerfile.centos7 @@ -1408,6 +1408,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \ fi; \ fi; +# Copy in any external conf sections to supplement generated MiGserver.conf +RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d +COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/ + #------------------------- next stage -----------------------------# FROM --platform=linux/$ARCH install_mig AS setup_mig_configs diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 85c1ddf5..b684b6e0 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1426,6 +1426,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \ fi; \ fi; +# Copy in any external conf sections to supplement generated MiGserver.conf +RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d +COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/ + #------------------------- next stage -----------------------------# FROM --platform=linux/$ARCH install_mig AS setup_mig_configs diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 2cd7333d..2930298d 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1302,6 +1302,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \ fi; \ fi; +# Copy in any external conf sections to supplement generated MiGserver.conf +RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d +COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/ + #------------------------- next stage -----------------------------# FROM --platform=linux/$ARCH install_mig AS setup_mig_configs diff --git a/Makefile b/Makefile index 9c8b7e91..20b25efa 100755 --- a/Makefile +++ b/Makefile @@ -99,6 +99,7 @@ initdirs: initcomposevars mkdir -p certs mkdir -p httpd mkdir -p mig + mkdir -p external-conf-sections mkdir -p state mkdir -p ${VOLATILE_ROOT}/mig_system_run mkdir -p ${VOLATILE_ROOT}/openid_store @@ -254,6 +255,7 @@ distclean: clean sitestateclean sitedataclean dockerclean dockervolumeclean rm -fr ./external-certificates # NOTE: certs remove in clean is conditional - always remove it here rm -fr ./certs + rm -fr ./external-conf-sections rm -f .env docker-compose.yml Dockerfile wipesitestatewarning: