Skip to content

Commit 50a5184

Browse files
committed
Symlink more of the optional wwwpublic site helpers into place:
* terms.html * cookie-policy.pdf * site-privacy-policy.pdf * security.txt * security-pub-keys.txt * security-pub-keys.txt.asc * security-disclosure-policy.txt by using the corresponding `-${DOMAIN}` version. If the latter doesn't exist it makes no difference compared to when the link is not there.
1 parent 00f40ba commit 50a5184

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

Dockerfile.centos7

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,13 +1503,27 @@ RUN ln -s index-${DOMAIN}.html $MIG_ROOT/state/wwwpublic/index.html && \
15031503
ln -s support-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/support-snippet.html && \
15041504
ln -s tips-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/tips-snippet.html && \
15051505
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms-snippet.html && \
1506+
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms.html && \
15061507
ln -s site-conf-${DOMAIN}.js $MIG_ROOT/mig/images/site-conf.js && \
15071508
# Make an empty template for status popup and status page to use.
15081509
# For inspiration on how to use it please refer to the samples at
15091510
# https://github.com/ucphhpc/migrid-ucph-sites/tree/main/state/wwwpublic
15101511
echo '[]' > $MIG_ROOT/state/wwwpublic/status-events-${DOMAIN}.json && \
15111512
ln -s status-events-${DOMAIN}.json $MIG_ROOT/state/wwwpublic/status-events.json && \
15121513
ln -s status-dynamic.html $MIG_ROOT/state/wwwpublic/status.html && \
1514+
# Optional site helpers which we symlink in order to use them if they exist
1515+
ln -s cookie-policy-${DOMAIN}.pdf \
1516+
$MIG_ROOT/state/wwwpublic/cookie-policy.pdf && \
1517+
ln -s site-privacy-policy-${DOMAIN}.pdf \
1518+
$MIG_ROOT/state/wwwpublic/site-privacy-policy.pdf && \
1519+
ln -s security-${DOMAIN}.txt \
1520+
$MIG_ROOT/state/wwwpublic/.well-known/security.txt && \
1521+
ln -s security-pub-keys-${DOMAIN}.txt \
1522+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt && \
1523+
ln -s security-pub-keys-${DOMAIN}.txt.asc \
1524+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt.asc && \
1525+
ln -s security-disclosure-policy-${DOMAIN}.txt \
1526+
$MIG_ROOT/state/wwwpublic/.well-known/security-disclosure-policy.txt && \
15131527
chown -R $USER:$GROUP $MIG_ROOT/state/wwwpublic/*.html
15141528

15151529
# TODO: improve this very crude and hard-coded translation

Dockerfile.rocky8

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,13 +1527,27 @@ RUN ln -s index-${DOMAIN}.html $MIG_ROOT/state/wwwpublic/index.html && \
15271527
ln -s support-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/support-snippet.html && \
15281528
ln -s tips-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/tips-snippet.html && \
15291529
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms-snippet.html && \
1530+
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms.html && \
15301531
ln -s site-conf-${DOMAIN}.js $MIG_ROOT/mig/images/site-conf.js && \
15311532
# Make an empty template for status popup and status page to use.
15321533
# For inspiration on how to use it please refer to the samples at
15331534
# https://github.com/ucphhpc/migrid-ucph-sites/tree/main/state/wwwpublic
15341535
echo '[]' > $MIG_ROOT/state/wwwpublic/status-events-${DOMAIN}.json && \
15351536
ln -s status-events-${DOMAIN}.json $MIG_ROOT/state/wwwpublic/status-events.json && \
15361537
ln -s status-dynamic.html $MIG_ROOT/state/wwwpublic/status.html && \
1538+
# Optional site helpers which we symlink in order to use them if they exist
1539+
ln -s cookie-policy-${DOMAIN}.pdf \
1540+
$MIG_ROOT/state/wwwpublic/cookie-policy.pdf && \
1541+
ln -s site-privacy-policy-${DOMAIN}.pdf \
1542+
$MIG_ROOT/state/wwwpublic/site-privacy-policy.pdf && \
1543+
ln -s security-${DOMAIN}.txt \
1544+
$MIG_ROOT/state/wwwpublic/.well-known/security.txt && \
1545+
ln -s security-pub-keys-${DOMAIN}.txt \
1546+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt && \
1547+
ln -s security-pub-keys-${DOMAIN}.txt.asc \
1548+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt.asc && \
1549+
ln -s security-disclosure-policy-${DOMAIN}.txt \
1550+
$MIG_ROOT/state/wwwpublic/.well-known/security-disclosure-policy.txt && \
15371551
chown -R $USER:$GROUP $MIG_ROOT/state/wwwpublic/*.html
15381552

15391553
# TODO: improve this very crude and hard-coded translation

Dockerfile.rocky9

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,13 +1401,27 @@ RUN ln -s index-${DOMAIN}.html $MIG_ROOT/state/wwwpublic/index.html && \
14011401
ln -s support-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/support-snippet.html && \
14021402
ln -s tips-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/tips-snippet.html && \
14031403
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms-snippet.html && \
1404+
ln -s terms-${EMULATE_FQDN}.html $MIG_ROOT/state/wwwpublic/terms.html && \
14041405
ln -s site-conf-${DOMAIN}.js $MIG_ROOT/mig/images/site-conf.js && \
14051406
# Make an empty template for status popup and status page to use.
14061407
# For inspiration on how to use it please refer to the samples at
14071408
# https://github.com/ucphhpc/migrid-ucph-sites/tree/main/state/wwwpublic
14081409
echo '[]' > $MIG_ROOT/state/wwwpublic/status-events-${DOMAIN}.json && \
14091410
ln -s status-events-${DOMAIN}.json $MIG_ROOT/state/wwwpublic/status-events.json && \
14101411
ln -s status-dynamic.html $MIG_ROOT/state/wwwpublic/status.html && \
1412+
# Optional site helpers which we symlink in order to use them if they exist
1413+
ln -s cookie-policy-${DOMAIN}.pdf \
1414+
$MIG_ROOT/state/wwwpublic/cookie-policy.pdf && \
1415+
ln -s site-privacy-policy-${DOMAIN}.pdf \
1416+
$MIG_ROOT/state/wwwpublic/site-privacy-policy.pdf && \
1417+
ln -s security-${DOMAIN}.txt \
1418+
$MIG_ROOT/state/wwwpublic/.well-known/security.txt && \
1419+
ln -s security-pub-keys-${DOMAIN}.txt \
1420+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt && \
1421+
ln -s security-pub-keys-${DOMAIN}.txt.asc \
1422+
$MIG_ROOT/state/wwwpublic/.well-known/security-pub-keys.txt.asc && \
1423+
ln -s security-disclosure-policy-${DOMAIN}.txt \
1424+
$MIG_ROOT/state/wwwpublic/.well-known/security-disclosure-policy.txt && \
14111425
chown -R $USER:$GROUP $MIG_ROOT/state/wwwpublic/*.html
14121426

14131427
# TODO: improve this very crude and hard-coded translation

0 commit comments

Comments
 (0)