Expose PUBLIC_SEC_FQDN in order to support the existing base FQDN (er…

…da.dk), www.FQDN (www.erda.dk) and NAME.ORG (erda.ku.dk) aliases as public front pages.
ucphhpc · Feb 3, 2025 · 0fb8c36 · 0fb8c36
1 parent 0d007aa
commit 0fb8c36
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
 ARG WILDCARD_DOMAIN=*.migrid.test
 ARG PUBLIC_DOMAIN=www.migrid.test
 ARG PUBLIC_ALIAS_DOMAIN=
+ARG PUBLIC_SEC_DOMAIN=
 ARG MIGCERT_DOMAIN=cert.migrid.test
 ARG EXTCERT_DOMAIN=
 ARG MIGOID_DOMAIN=ext.migrid.test
@@ -624,6 +625,7 @@ FROM --platform=linux/$ARCH base AS setup_security
 ARG DOMAIN
 ARG WILDCARD_DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -713,10 +715,10 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub combined.pub \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
-    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_ALIAS_DOMAIN}" \
-	   "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" "${MIGOID_DOMAIN}" \
-	   "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" "${SID_DOMAIN}" \
-	   "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
+    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
+           "${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
+           "${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
+           "${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
            "${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
                [ -L "$domain" ] || ln -s MiG/${WILDCARD_DOMAIN} $domain; \
        done ; fi
@@ -986,6 +988,7 @@ RUN if [ "${PREFER_PYTHON3}" = "True" -o "${MODERN_WSGIDAV}" = "True" ]; then \
 FROM --platform=linux/$ARCH download_mig AS install_mig
 ARG DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -1207,6 +1210,7 @@ RUN python2 ./generateconfs.py --source=. \
     --destination=generated-confs \
     --base_fqdn=$DOMAIN \
     --public_fqdn=${PUBLIC_DOMAIN} \
+    --public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
     --public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
     --mig_cert_fqdn=${MIGCERT_DOMAIN} \
     --ext_cert_fqdn=${EXTCERT_DOMAIN} \

diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
 ARG WILDCARD_DOMAIN=*.migrid.test
 ARG PUBLIC_DOMAIN=www.migrid.test
 ARG PUBLIC_ALIAS_DOMAIN=
+ARG PUBLIC_SEC_DOMAIN=
 ARG MIGCERT_DOMAIN=cert.migrid.test
 ARG EXTCERT_DOMAIN=
 ARG MIGOID_DOMAIN=ext.migrid.test
@@ -641,6 +642,7 @@ FROM --platform=linux/$ARCH base AS setup_security
 ARG DOMAIN
 ARG WILDCARD_DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -730,10 +732,10 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub combined.pub \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
-    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_ALIAS_DOMAIN}" \
-	   "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" "${MIGOID_DOMAIN}" \
-	   "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" "${SID_DOMAIN}" \
-	   "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
+    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
+           "${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
+           "${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
+           "${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
            "${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
                [ -L "$domain" ] || ln -s MiG/${WILDCARD_DOMAIN} $domain; \
        done ; fi
@@ -1005,6 +1007,7 @@ RUN if [ "${PREFER_PYTHON3}" = "True" -o "${MODERN_WSGIDAV}" = "True" ]; then \
 FROM --platform=linux/$ARCH download_mig AS install_mig
 ARG DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -1226,6 +1229,7 @@ RUN ./generateconfs.py --source=. \
     --destination=generated-confs \
     --base_fqdn=$DOMAIN \
     --public_fqdn=${PUBLIC_DOMAIN} \
+    --public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
     --public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
     --mig_cert_fqdn=${MIGCERT_DOMAIN} \
     --ext_cert_fqdn=${EXTCERT_DOMAIN} \

diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
 ARG WILDCARD_DOMAIN=*.migrid.test
 ARG PUBLIC_DOMAIN=www.migrid.test
 ARG PUBLIC_ALIAS_DOMAIN=
+ARG PUBLIC_SEC_DOMAIN=
 ARG MIGCERT_DOMAIN=cert.migrid.test
 ARG EXTCERT_DOMAIN=
 ARG MIGOID_DOMAIN=ext.migrid.test
@@ -600,6 +601,7 @@ FROM --platform=linux/$ARCH base AS setup_security
 ARG DOMAIN
 ARG WILDCARD_DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -689,10 +691,10 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub combined.pub \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
     && ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
-    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_ALIAS_DOMAIN}" \
-	   "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" "${MIGOID_DOMAIN}" \
-	   "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" "${SID_DOMAIN}" \
-	   "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
+    && for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
+           "${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
+           "${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
+           "${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
            "${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
                [ -L "$domain" ] || ln -s MiG/${WILDCARD_DOMAIN} $domain; \
        done ; fi
@@ -897,6 +899,7 @@ RUN rm -f ${MIG_ROOT}/mig/server/grid_webdavs.py ; \
 FROM --platform=linux/$ARCH download_mig AS install_mig
 ARG DOMAIN
 ARG PUBLIC_DOMAIN
+ARG PUBLIC_SEC_DOMAIN
 ARG PUBLIC_ALIAS_DOMAIN
 ARG MIGCERT_DOMAIN
 ARG EXTCERT_DOMAIN
@@ -1102,6 +1105,7 @@ RUN ./generateconfs.py --source=. \
     --destination=generated-confs \
     --base_fqdn=$DOMAIN \
     --public_fqdn=${PUBLIC_DOMAIN} \
+    --public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
     --public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
     --mig_cert_fqdn=${MIGCERT_DOMAIN} \
     --ext_cert_fqdn=${EXTCERT_DOMAIN} \

diff --git a/development.env b/development.env
@@ -28,6 +28,7 @@ VOLATILE_ROOT=${DOCKER_MIGRID_ROOT}/sitetmp
 DOMAIN=migrid.test
 WILDCARD_DOMAIN=*.migrid.test
 PUBLIC_DOMAIN=www.migrid.test
+PUBLIC_SEC_DOMAIN=
 PUBLIC_ALIAS_DOMAIN=
 MIGCERT_DOMAIN=
 EXTCERT_DOMAIN=

diff --git a/development_gdp.env b/development_gdp.env
@@ -28,6 +28,7 @@ VOLATILE_ROOT=${DOCKER_MIGRID_ROOT}/sitetmp
 DOMAIN=gdp.test
 WILDCARD_DOMAIN=*.gdp.test
 PUBLIC_DOMAIN=www.gdp.test
+PUBLIC_SEC_DOMAIN=
 PUBLIC_ALIAS_DOMAIN=
 MIGCERT_DOMAIN=
 EXTCERT_DOMAIN=

diff --git a/production.env b/production.env
@@ -28,6 +28,7 @@ VOLATILE_ROOT=${DOCKER_MIGRID_ROOT}/sitetmp
 DOMAIN=migrid.test
 WILDCARD_DOMAIN=*.migrid.test
 PUBLIC_DOMAIN=www.migrid.test
+PUBLIC_SEC_DOMAIN=
 PUBLIC_ALIAS_DOMAIN=
 MIGCERT_DOMAIN=
 EXTCERT_DOMAIN=