Skip to content

Commit a1a47d1

Browse files
jonasbardinojonasbardino
authored
Expose new STATUS_ALIAS_FQDN from PR192. (#81)
For exposing the new `STATUS_ALIAS_FQDN` in actual docker-migrid deployment.
2 parents abf0f81 + 0b81f4e commit a1a47d1

File tree

8 files changed

+26
-3
lines changed

8 files changed

+26
-3
lines changed

‎.spellcheck-wordlist.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,3 +362,5 @@ userinfo
362362
migcheckssl
363363
OPENSTACKSDK
364364
openstacksdk
365+
HTML
366+
html

‎Dockerfile.centos7‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
1818
ARG WILDCARD_DOMAIN=*.migrid.test
1919
ARG PUBLIC_DOMAIN=www.migrid.test
2020
ARG PUBLIC_ALIAS_DOMAIN=
21+
ARG STATUS_ALIAS_DOMAIN=
2122
ARG PUBLIC_SEC_DOMAIN=
2223
ARG MIGCERT_DOMAIN=cert.migrid.test
2324
ARG EXTCERT_DOMAIN=
@@ -627,6 +628,7 @@ ARG WILDCARD_DOMAIN
627628
ARG PUBLIC_DOMAIN
628629
ARG PUBLIC_SEC_DOMAIN
629630
ARG PUBLIC_ALIAS_DOMAIN
631+
ARG STATUS_ALIAS_DOMAIN
630632
ARG MIGCERT_DOMAIN
631633
ARG EXTCERT_DOMAIN
632634
ARG MIGOID_DOMAIN
@@ -716,7 +718,8 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
716718
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
717719
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
718720
&& for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
719-
"${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
721+
"${PUBLIC_ALIAS_DOMAIN}" "${STATUS_ALIAS_DOMAIN}" \
722+
"${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
720723
"${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
721724
"${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
722725
"${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
@@ -990,6 +993,7 @@ ARG DOMAIN
990993
ARG PUBLIC_DOMAIN
991994
ARG PUBLIC_SEC_DOMAIN
992995
ARG PUBLIC_ALIAS_DOMAIN
996+
ARG STATUS_ALIAS_DOMAIN
993997
ARG MIGCERT_DOMAIN
994998
ARG EXTCERT_DOMAIN
995999
ARG MIGOID_DOMAIN
@@ -1212,6 +1216,7 @@ RUN python2 ./generateconfs.py --source=. \
12121216
--public_fqdn=${PUBLIC_DOMAIN} \
12131217
--public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
12141218
--public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
1219+
--status_alias_fqdn=${STATUS_ALIAS_DOMAIN} \
12151220
--mig_cert_fqdn=${MIGCERT_DOMAIN} \
12161221
--ext_cert_fqdn=${EXTCERT_DOMAIN} \
12171222
--mig_oid_fqdn=${MIGOID_DOMAIN} \

‎Dockerfile.rocky8‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
1818
ARG WILDCARD_DOMAIN=*.migrid.test
1919
ARG PUBLIC_DOMAIN=www.migrid.test
2020
ARG PUBLIC_ALIAS_DOMAIN=
21+
ARG STATUS_ALIAS_DOMAIN=
2122
ARG PUBLIC_SEC_DOMAIN=
2223
ARG MIGCERT_DOMAIN=cert.migrid.test
2324
ARG EXTCERT_DOMAIN=
@@ -644,6 +645,7 @@ ARG WILDCARD_DOMAIN
644645
ARG PUBLIC_DOMAIN
645646
ARG PUBLIC_SEC_DOMAIN
646647
ARG PUBLIC_ALIAS_DOMAIN
648+
ARG STATUS_ALIAS_DOMAIN
647649
ARG MIGCERT_DOMAIN
648650
ARG EXTCERT_DOMAIN
649651
ARG MIGOID_DOMAIN
@@ -733,7 +735,8 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
733735
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
734736
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
735737
&& for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
736-
"${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
738+
"${PUBLIC_ALIAS_DOMAIN}" "${STATUS_ALIAS_DOMAIN}" \
739+
"${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
737740
"${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
738741
"${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
739742
"${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
@@ -1009,6 +1012,7 @@ ARG DOMAIN
10091012
ARG PUBLIC_DOMAIN
10101013
ARG PUBLIC_SEC_DOMAIN
10111014
ARG PUBLIC_ALIAS_DOMAIN
1015+
ARG STATUS_ALIAS_DOMAIN
10121016
ARG MIGCERT_DOMAIN
10131017
ARG EXTCERT_DOMAIN
10141018
ARG MIGOID_DOMAIN
@@ -1231,6 +1235,7 @@ RUN ./generateconfs.py --source=. \
12311235
--public_fqdn=${PUBLIC_DOMAIN} \
12321236
--public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
12331237
--public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
1238+
--status_alias_fqdn=${STATUS_ALIAS_DOMAIN} \
12341239
--mig_cert_fqdn=${MIGCERT_DOMAIN} \
12351240
--ext_cert_fqdn=${EXTCERT_DOMAIN} \
12361241
--mig_oid_fqdn=${MIGOID_DOMAIN} \

‎Dockerfile.rocky9‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ARG DOMAIN=migrid.test
1818
ARG WILDCARD_DOMAIN=*.migrid.test
1919
ARG PUBLIC_DOMAIN=www.migrid.test
2020
ARG PUBLIC_ALIAS_DOMAIN=
21+
ARG STATUS_ALIAS_DOMAIN=
2122
ARG PUBLIC_SEC_DOMAIN=
2223
ARG MIGCERT_DOMAIN=cert.migrid.test
2324
ARG EXTCERT_DOMAIN=
@@ -603,6 +604,7 @@ ARG WILDCARD_DOMAIN
603604
ARG PUBLIC_DOMAIN
604605
ARG PUBLIC_SEC_DOMAIN
605606
ARG PUBLIC_ALIAS_DOMAIN
607+
ARG STATUS_ALIAS_DOMAIN
606608
ARG MIGCERT_DOMAIN
607609
ARG EXTCERT_DOMAIN
608610
ARG MIGOID_DOMAIN
@@ -692,7 +694,8 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
692694
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.md5 combined.pub.md5 \
693695
&& ln -s MiG/${WILDCARD_DOMAIN}/combined.pub.sha256 combined.pub.sha256 \
694696
&& for domain in "${PUBLIC_DOMAIN}" "${PUBLIC_SEC_DOMAIN}" \
695-
"${PUBLIC_ALIAS_DOMAIN}" "${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
697+
"${PUBLIC_ALIAS_DOMAIN}" "${STATUS_ALIAS_DOMAIN}" \
698+
"${MIGCERT_DOMAIN}" "${EXTCERT_DOMAIN}" \
696699
"${MIGOID_DOMAIN}" "${EXTOID_DOMAIN}" "${EXTOIDC_DOMAIN}" \
697700
"${SID_DOMAIN}" "${IO_DOMAIN}" "${OPENID_DOMAIN}" "${SFTP_DOMAIN}" \
698701
"${FTPS_DOMAIN}" "${WEBDAVS_DOMAIN}"; do \
@@ -901,6 +904,7 @@ ARG DOMAIN
901904
ARG PUBLIC_DOMAIN
902905
ARG PUBLIC_SEC_DOMAIN
903906
ARG PUBLIC_ALIAS_DOMAIN
907+
ARG STATUS_ALIAS_DOMAIN
904908
ARG MIGCERT_DOMAIN
905909
ARG EXTCERT_DOMAIN
906910
ARG MIGOID_DOMAIN
@@ -1107,6 +1111,7 @@ RUN ./generateconfs.py --source=. \
11071111
--public_fqdn=${PUBLIC_DOMAIN} \
11081112
--public_sec_fqdn=${PUBLIC_SEC_DOMAIN} \
11091113
--public_alias_fqdn=${PUBLIC_ALIAS_DOMAIN} \
1114+
--status_alias_fqdn=${STATUS_ALIAS_DOMAIN} \
11101115
--mig_cert_fqdn=${MIGCERT_DOMAIN} \
11111116
--ext_cert_fqdn=${EXTCERT_DOMAIN} \
11121117
--mig_oid_fqdn=${MIGOID_DOMAIN} \

‎development.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ WILDCARD_DOMAIN=*.migrid.test
3030
PUBLIC_DOMAIN=www.migrid.test
3131
PUBLIC_SEC_DOMAIN=
3232
PUBLIC_ALIAS_DOMAIN=
33+
STATUS_ALIAS_DOMAIN=
3334
MIGCERT_DOMAIN=
3435
EXTCERT_DOMAIN=
3536
MIGOID_DOMAIN=ext.migrid.test

‎development_gdp.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ WILDCARD_DOMAIN=*.gdp.test
3030
PUBLIC_DOMAIN=www.gdp.test
3131
PUBLIC_SEC_DOMAIN=
3232
PUBLIC_ALIAS_DOMAIN=
33+
STATUS_ALIAS_DOMAIN=
3334
MIGCERT_DOMAIN=
3435
EXTCERT_DOMAIN=
3536
MIGOID_DOMAIN=ext.gdp.test

‎doc/source/sections/configuration/variables.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ Variables
8585
* - PUBLIC_ALIAS_DOMAIN
8686
-
8787
- Optional domain alias for the public migrid web pages, e.g. to allow plain `DOMAIN`, `www.DOMAIN` and an organizational alias to work as front page
88+
* - STATUS_ALIAS_DOMAIN
89+
-
90+
- Optional domain alias for an integrated site status web page, e.g. to allow a `status.DOMAIN` alias for one of the existing public FQDN virtual hosts in order to let it work as a direct pointer to the status.html in wwwpublic folder and thereby expose the complete status overview also integrated on the status popup on the user pages.
8891
* - MIGCERT_DOMAIN
8992
- cert.migrid.test
9093
- The optional domain under which migrid web for certificate-based authentication with a local CA will be reachable.

‎production.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ WILDCARD_DOMAIN=*.migrid.test
3030
PUBLIC_DOMAIN=www.migrid.test
3131
PUBLIC_SEC_DOMAIN=
3232
PUBLIC_ALIAS_DOMAIN=
33+
STATUS_ALIAS_DOMAIN=
3334
MIGCERT_DOMAIN=
3435
EXTCERT_DOMAIN=
3536
MIGOID_DOMAIN=ext.migrid.test

0 commit comments

Comments
 (0)